From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 23 Apr 2009 09:37:17 +0000 (+0100)
Subject: Merge branch 'for-2.6.30' into for-2.6.31
X-Git-Tag: v2.6.31-rc1~38^2~5^2~101
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=049da6393fb30b62e418beb59a74dfcad513fc6d;hp=-c

Merge branch 'for-2.6.30' into for-2.6.31
---

049da6393fb30b62e418beb59a74dfcad513fc6d
diff --combined sound/soc/codecs/Makefile
index d8e15a47711e,f2653803ede8..811696861d31
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@@ -23,9 -23,7 +23,9 @@@ snd-soc-wm8750-objs := wm8750.
  snd-soc-wm8753-objs := wm8753.o
  snd-soc-wm8900-objs := wm8900.o
  snd-soc-wm8903-objs := wm8903.o
 +snd-soc-wm8960-objs := wm8960.o
  snd-soc-wm8971-objs := wm8971.o
 +snd-soc-wm8988-objs := wm8988.o
  snd-soc-wm8990-objs := wm8990.o
  snd-soc-wm9705-objs := wm9705.o
  snd-soc-wm9712-objs := wm9712.o
@@@ -57,10 -55,7 +57,9 @@@ obj-$(CONFIG_SND_SOC_WM8753)	+= snd-soc
  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_WM8960)	+= snd-soc-wm8960.o
 +obj-$(CONFIG_SND_SOC_WM8988)	+= snd-soc-wm8988.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