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

Commit 672b0c6a authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-3.2' into for-3.3

parents 7d46a528 36d54dc0

sound/soc/kirkwood/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ config SND_KIRKWOOD_SOC_I2S 
config SND_KIRKWOOD_SOC_OPENRD

	tristate "SoC Audio support for Kirkwood Openrd Client"

	depends on SND_KIRKWOOD_SOC && (MACH_OPENRD_CLIENT || MACH_OPENRD_ULTIMATE)

	depends on I2C

	select SND_KIRKWOOD_SOC_I2S

	select SND_SOC_CS42L51

	help
@@ -20,7 +21,7 @@ config SND_KIRKWOOD_SOC_OPENRD 


config SND_KIRKWOOD_SOC_T5325

	tristate "SoC Audio support for HP t5325"

	depends on SND_KIRKWOOD_SOC && MACH_T5325

	depends on SND_KIRKWOOD_SOC && MACH_T5325 && I2C

	select SND_KIRKWOOD_SOC_I2S

	select SND_SOC_ALC5623

	help