summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-04-23 10:33:47 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-04-23 10:33:47 +0100
commit19ab054df82dd096981b0d2365ab0be28815dc49 (patch)
tree6307eb9d16ccbe6c731a9b6650196695e3241b0c /sound/soc
parentccb077fd466ec3f35662d6c66412b42b36e11bc3 (diff)
parenta1992db55d80297544a65160ddb98afba45f7759 (diff)
downloadblackbird-op-linux-19ab054df82dd096981b0d2365ab0be28815dc49.tar.gz
blackbird-op-linux-19ab054df82dd096981b0d2365ab0be28815dc49.zip
Merge commit 'takashi/fix/asoc' into for-2.6.30
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/codecs/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
index 030d2454725f..f2653803ede8 100644
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@ -56,7 +56,6 @@ obj-$(CONFIG_SND_SOC_WM8900) += snd-soc-wm8900.o
obj-$(CONFIG_SND_SOC_WM8903) += snd-soc-wm8903.o
obj-$(CONFIG_SND_SOC_WM8971) += snd-soc-wm8971.o
obj-$(CONFIG_SND_SOC_WM8990) += snd-soc-wm8990.o
-obj-$(CONFIG_SND_SOC_WM8991) += snd-soc-wm8991.o
obj-$(CONFIG_SND_SOC_WM9705) += snd-soc-wm9705.o
obj-$(CONFIG_SND_SOC_WM9712) += snd-soc-wm9712.o
obj-$(CONFIG_SND_SOC_WM9713) += snd-soc-wm9713.o
OpenPOWER on IntegriCloud