diff options
| author | Andy Green <andy.green@linaro.org> | 2011-04-13 11:32:54 +0100 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2011-04-13 11:32:54 +0100 |
| commit | af8cf92eb350fce3df47f58df576ba0458815984 (patch) | |
| tree | 1f550b9a254a6790e56b95bf7e7e5dcc13466110 | |
| parent | e623403fb8655b96cc25a52e6d74e1944d191ece (diff) | |
alsa panda hdmi audio ensure cpu dai gets built
Signed-off-by: Andy Green <andy.green@linaro.org>
| -rw-r--r-- | sound/soc/omap/Kconfig | 3 | ||||
| -rw-r--r-- | sound/soc/omap/Makefile | 4 |
2 files changed, 1 insertions, 6 deletions
diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig index b9cf4bc0d3c..771da39fa9f 100644 --- a/sound/soc/omap/Kconfig +++ b/sound/soc/omap/Kconfig @@ -12,9 +12,6 @@ config SND_OMAP_SOC_MCBSP config SND_OMAP_SOC_MCPDM tristate -config SND_OMAP_SOC_HDMI - tristate - config SND_OMAP_SOC_ABE select SND_DYNAMIC_MINORS tristate diff --git a/sound/soc/omap/Makefile b/sound/soc/omap/Makefile index 872763bfb83..0267ec9e43a 100644 --- a/sound/soc/omap/Makefile +++ b/sound/soc/omap/Makefile @@ -5,7 +5,6 @@ snd-soc-omap-dmic-objs := omap-dmic.o snd-soc-omap-mcbsp-objs := omap-mcbsp.o snd-soc-omap-mcpdm-objs := omap-mcpdm.o snd-soc-omap-abe-dsp-objs := omap-abe-dsp.o -snd-soc-omap-hdmi-objs := omap-hdmi.o obj-$(CONFIG_SND_OMAP_SOC_ABE) += snd-soc-omap-abe.o obj-$(CONFIG_SND_OMAP_SOC) += snd-soc-omap.o @@ -13,7 +12,6 @@ obj-$(CONFIG_SND_OMAP_SOC_DMIC) += snd-soc-omap-dmic.o obj-$(CONFIG_SND_OMAP_SOC_MCBSP) += snd-soc-omap-mcbsp.o obj-$(CONFIG_SND_OMAP_SOC_MCPDM) += snd-soc-omap-mcpdm.o obj-$(CONFIG_SND_OMAP_SOC_ABE_DSP) += snd-soc-omap-abe-dsp.o abe/ -obj-$(CONFIG_SND_OMAP_SOC_HDMI) += snd-soc-omap-hdmi.o # OMAP Machine Support snd-soc-n810-objs := n810.o @@ -30,7 +28,7 @@ snd-soc-omap3pandora-objs := omap3pandora.o snd-soc-omap3beagle-objs := omap3beagle.o snd-soc-zoom2-objs := zoom2.o snd-soc-igep0020-objs := igep0020.o -snd-soc-omap4-hdmi-objs := omap4-hdmi-card.o +snd-soc-omap4-hdmi-objs := omap-hdmi.o omap4-hdmi-card.o obj-$(CONFIG_SND_OMAP_SOC_N810) += snd-soc-n810.o obj-$(CONFIG_SND_OMAP_SOC_RX51) += snd-soc-rx51.o |