Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e370f45a authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'wm8961' into for-2.6.32

parents f274143f 74dc55ed

sound/soc/codecs/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ config SND_SOC_ALL_CODECS 
	select SND_SOC_WM8903 if I2C

	select SND_SOC_WM8940 if I2C

	select SND_SOC_WM8960 if I2C

	select SND_SOC_WM8961 if I2C

	select SND_SOC_WM8971 if I2C

	select SND_SOC_WM8988 if SND_SOC_I2C_AND_SPI

	select SND_SOC_WM8990 if I2C
@@ -156,6 +157,9 @@ config SND_SOC_WM8940 
config SND_SOC_WM8960

	tristate



config SND_SOC_WM8961

	tristate



config SND_SOC_WM8971

	tristate

sound/soc/codecs/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ snd-soc-wm8900-objs := wm8900.o 
snd-soc-wm8903-objs := wm8903.o

snd-soc-wm8940-objs := wm8940.o

snd-soc-wm8960-objs := wm8960.o

snd-soc-wm8961-objs := wm8961.o

snd-soc-wm8971-objs := wm8971.o

snd-soc-wm8988-objs := wm8988.o

snd-soc-wm8990-objs := wm8990.o
@@ -65,6 +66,7 @@ obj-$(CONFIG_SND_SOC_WM8903) += snd-soc-wm8903.o 
obj-$(CONFIG_SND_SOC_WM8971)	+= snd-soc-wm8971.o

obj-$(CONFIG_SND_SOC_WM8940)	+= snd-soc-wm8940.o

obj-$(CONFIG_SND_SOC_WM8960)	+= snd-soc-wm8960.o

obj-$(CONFIG_SND_SOC_WM8961)	+= snd-soc-wm8961.o

obj-$(CONFIG_SND_SOC_WM8988)	+= snd-soc-wm8988.o

obj-$(CONFIG_SND_SOC_WM8990)	+= snd-soc-wm8990.o

obj-$(CONFIG_SND_SOC_WM9081)	+= snd-soc-wm9081.o