diff options
| author | NeilBrown <neilb@suse.de> | 2013-07-26 11:04:53 +1000 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2013-07-26 11:04:53 +1000 |
| commit | 1bf3c840b8061c526c0f442d9697311572d9cc6e (patch) | |
| tree | b6fc101b797024e47cec240b90e12864dc70fa0f /sound/soc/omap/Makefile | |
| parent | 855ee922b7f6df94a36bb8acff0a354550203e39 (diff) | |
| parent | b3a3a9c441e2c8f6b6760de9331023a7906a4ac6 (diff) | |
| download | kernel_goldelico_gta04-1bf3c840b8061c526c0f442d9697311572d9cc6e.zip kernel_goldelico_gta04-1bf3c840b8061c526c0f442d9697311572d9cc6e.tar.gz kernel_goldelico_gta04-1bf3c840b8061c526c0f442d9697311572d9cc6e.tar.bz2 | |
Merge branch 'master' into mainline
Conflicts:
drivers/mmc/core/core.c
drivers/pwm/Kconfig
drivers/pwm/Makefile
Diffstat (limited to 'sound/soc/omap/Makefile')
| -rw-r--r-- | sound/soc/omap/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/omap/Makefile b/sound/soc/omap/Makefile index 09cd9e2..0e23acc 100644 --- a/sound/soc/omap/Makefile +++ b/sound/soc/omap/Makefile @@ -28,7 +28,6 @@ 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_OMAP2EVM) += snd-soc-omap2evm.o obj-$(CONFIG_SND_OMAP_SOC_AM3517EVM) += snd-soc-am3517evm.o obj-$(CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040) += snd-soc-omap-abe-twl6040.o obj-$(CONFIG_SND_OMAP_SOC_OMAP_TWL4030) += snd-soc-omap-twl4030.o |