diff options
author | Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> | 2013-07-21 01:05:26 +0200 |
---|---|---|
committer | Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> | 2013-07-21 01:05:26 +0200 |
commit | 6c9eb5354df00a9676a38bdcf57d51a4f5b66c85 (patch) | |
tree | eb2274e2a42a22892f0a0dc6886f84dbcd0ac180 | |
parent | 133e33305bebb685d4d50c71fccf1910f5ff3b5c (diff) | |
download | kernel_goldelico_gta04-6c9eb5354df00a9676a38bdcf57d51a4f5b66c85.zip kernel_goldelico_gta04-6c9eb5354df00a9676a38bdcf57d51a4f5b66c85.tar.gz kernel_goldelico_gta04-6c9eb5354df00a9676a38bdcf57d51a4f5b66c85.tar.bz2 |
MERGE
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
-rw-r--r-- | sound/soc/omap/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/omap/Makefile b/sound/soc/omap/Makefile index 92d4385..e3f3885 100644 --- a/sound/soc/omap/Makefile +++ b/sound/soc/omap/Makefile @@ -20,7 +20,7 @@ snd-soc-am3517evm-objs := am3517evm.o snd-soc-omap-abe-twl6040-objs := omap-abe-twl6040.o snd-soc-omap-twl4030-objs := omap-twl4030.o snd-soc-omap3pandora-objs := omap3pandora.o -snd-soc-gta04-objs := gta04-audio.o gta04-voice.o gta04-headset.o gta04-fm.o +snd-soc-gta04-objs := gta04-audio.o gta04-voice.o gta04-headset.o # gta04-fm.o snd-soc-omap-hdmi-card-objs := omap-hdmi-card.o |