From: Mark Brown Date: Tue, 18 Aug 2009 19:59:01 +0000 (+0100) Subject: Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai... X-Git-Tag: v2.6.33-rc1~77^2~1^2~110^2~4 X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=f72222c74bd642182cc892c99df65cb105c61193;p=sfrench%2Fcifs-2.6.git Merge branch 'topic/asoc' of git://git./linux/kernel/git/tiwai/sound-2.6 into upstream/wm8711 --- f72222c74bd642182cc892c99df65cb105c61193 diff --cc sound/soc/codecs/Kconfig index 663840e67766,167a5ce06cdf..a5cfa78eb166 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@@ -28,8 -33,8 +33,9 @@@ config SND_SOC_ALL_CODEC select SND_SOC_WM8350 if MFD_WM8350 select SND_SOC_WM8400 if MFD_WM8400 select SND_SOC_WM8510 if SND_SOC_I2C_AND_SPI + select SND_SOC_WM8523 if I2C select SND_SOC_WM8580 if I2C + select SND_SOC_WM8711 if I2C select SND_SOC_WM8728 if SND_SOC_I2C_AND_SPI select SND_SOC_WM8731 if SND_SOC_I2C_AND_SPI select SND_SOC_WM8750 if SND_SOC_I2C_AND_SPI diff --cc sound/soc/codecs/Makefile index 19950e998b6b,fbab43bbe3a7..711d8f5887de --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@@ -16,8 -21,8 +21,9 @@@ snd-soc-uda1380-objs := uda1380. snd-soc-wm8350-objs := wm8350.o snd-soc-wm8400-objs := wm8400.o snd-soc-wm8510-objs := wm8510.o + snd-soc-wm8523-objs := wm8523.o snd-soc-wm8580-objs := wm8580.o +snd-soc-wm8711-objs := wm8711.o snd-soc-wm8728-objs := wm8728.o snd-soc-wm8731-objs := wm8731.o snd-soc-wm8750-objs := wm8750.o @@@ -48,8 -70,8 +71,9 @@@ obj-$(CONFIG_SND_SOC_UDA1380) += snd-so obj-$(CONFIG_SND_SOC_WM8350) += snd-soc-wm8350.o obj-$(CONFIG_SND_SOC_WM8400) += snd-soc-wm8400.o obj-$(CONFIG_SND_SOC_WM8510) += snd-soc-wm8510.o + obj-$(CONFIG_SND_SOC_WM8523) += snd-soc-wm8523.o obj-$(CONFIG_SND_SOC_WM8580) += snd-soc-wm8580.o +obj-$(CONFIG_SND_SOC_WM8711) += snd-soc-wm8711.o obj-$(CONFIG_SND_SOC_WM8728) += snd-soc-wm8728.o obj-$(CONFIG_SND_SOC_WM8731) += snd-soc-wm8731.o obj-$(CONFIG_SND_SOC_WM8750) += snd-soc-wm8750.o