diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-06-25 17:28:39 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-06-25 17:28:39 +0400 |
| commit | 62b1653e29d8f359c4c7e045b965dc963459473d (patch) | |
| tree | 4f0d3f541c9eead5785f4e0230c46375a819ab60 /sound/soc/omap/Makefile | |
| parent | 10121a12e2380fb34b6e646a8e367add06d036c3 (diff) | |
| parent | d5fc3b5fe374f24b6773c22e90ef4bdda718b845 (diff) | |
| download | linux-62b1653e29d8f359c4c7e045b965dc963459473d.tar.xz | |
Merge branch 'for-2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into topic/asoc
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 a37f49862389..fefc48f02bd3 100644 --- a/sound/soc/omap/Makefile +++ b/sound/soc/omap/Makefile @@ -14,6 +14,7 @@ snd-soc-omap3evm-objs := omap3evm.o snd-soc-sdp3430-objs := sdp3430.o snd-soc-omap3pandora-objs := omap3pandora.o snd-soc-omap3beagle-objs := omap3beagle.o +snd-soc-zoom2-objs := zoom2.o obj-$(CONFIG_SND_OMAP_SOC_N810) += snd-soc-n810.o obj-$(CONFIG_SND_OMAP_SOC_OSK5912) += snd-soc-osk5912.o @@ -23,3 +24,4 @@ obj-$(CONFIG_MACH_OMAP3EVM) += snd-soc-omap3evm.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 +obj-$(CONFIG_SND_OMAP_SOC_ZOOM2) += snd-soc-zoom2.o |