diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-12 18:18:04 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-12 18:18:04 +0100 |
| commit | f52d7a4393136107f526040f6ef190ab49032496 (patch) | |
| tree | 5e6ed35ef95d31ad9b842f0d19eb3c4498e85b24 /sound | |
| parent | fcfdebe70759c74e2e701f69aaa7f0e5e32cf5a6 (diff) | |
| parent | 761c9d45d14e0afa3c0b8eb84b4075602e50533b (diff) | |
| download | linux-f52d7a4393136107f526040f6ef190ab49032496.tar.gz linux-f52d7a4393136107f526040f6ef190ab49032496.tar.bz2 linux-f52d7a4393136107f526040f6ef190ab49032496.zip | |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/omap/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/omap/Makefile b/sound/soc/omap/Makefile index d49458a29bb7..3db8a6c523f4 100644 --- a/sound/soc/omap/Makefile +++ b/sound/soc/omap/Makefile @@ -23,9 +23,9 @@ obj-$(CONFIG_SND_OMAP_SOC_N810) += snd-soc-n810.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 -obj-$(CONFIG_MACH_OMAP2EVM) += snd-soc-omap2evm.o -obj-$(CONFIG_MACH_OMAP3EVM) += snd-soc-omap3evm.o -obj-$(CONFIG_MACH_OMAP3517EVM) += snd-soc-am3517evm.o +obj-$(CONFIG_SND_OMAP_SOC_OMAP2EVM) += snd-soc-omap2evm.o +obj-$(CONFIG_SND_OMAP_SOC_OMAP3EVM) += snd-soc-omap3evm.o +obj-$(CONFIG_SND_OMAP_SOC_OMAP3517EVM) += snd-soc-am3517evm.o obj-$(CONFIG_SND_OMAP_SOC_SDP3430) += snd-soc-sdp3430.o obj-$(CONFIG_SND_OMAP_SOC_OMAP3_PANDORA) += snd-soc-omap3pandora.o obj-$(CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE) += snd-soc-omap3beagle.o |