Merge branch 'for-2.6.30' into for-2.6.31

diff --combined sound/soc/codecs/Makefile
index d8e15a4,f265380..8116968
--- 1/sound/soc/codecs/Makefile
--- 2/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