diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-05-07 17:38:26 +0200 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-05-07 17:38:26 +0200 |
commit | 305787649826d6c84a6f9f71bc3318460610aba4 (patch) | |
tree | b36cfe60e6f806414b1e6c042f0be233f114986f /sound/soc/omap/Makefile | |
parent | ARM: S3C2412: DMA: Remove I2S FIFO address (diff) | |
parent | Merge branch 'for-2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/lr... (diff) | |
download | linux-305787649826d6c84a6f9f71bc3318460610aba4.tar.xz linux-305787649826d6c84a6f9f71bc3318460610aba4.zip |
Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into for-2.6.35
Diffstat (limited to 'sound/soc/omap/Makefile')
-rw-r--r-- | sound/soc/omap/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/omap/Makefile b/sound/soc/omap/Makefile index 0bc00ca14b37..3a75755f25e4 100644 --- a/sound/soc/omap/Makefile +++ b/sound/soc/omap/Makefile @@ -9,6 +9,7 @@ obj-$(CONFIG_SND_OMAP_SOC_MCPDM) += snd-soc-omap-mcpdm.o # OMAP Machine Support snd-soc-n810-objs := n810.o +snd-soc-rx51-objs := rx51.o snd-soc-ams-delta-objs := ams-delta.o snd-soc-osk5912-objs := osk5912.o snd-soc-overo-objs := overo.o @@ -22,6 +23,7 @@ snd-soc-zoom2-objs := zoom2.o snd-soc-igep0020-objs := igep0020.o obj-$(CONFIG_SND_OMAP_SOC_N810) += snd-soc-n810.o +obj-$(CONFIG_SND_OMAP_SOC_RX51) += snd-soc-rx51.o obj-$(CONFIG_SND_OMAP_SOC_AMS_DELTA) += snd-soc-ams-delta.o obj-$(CONFIG_SND_OMAP_SOC_OSK5912) += snd-soc-osk5912.o obj-$(CONFIG_SND_OMAP_SOC_OVERO) += snd-soc-overo.o |