Commit b3d7e3c9 authored by Mark Brown's avatar Mark Brown

Merge commit 'takashi/topic/asoc' into for-2.6.30

parents eac84739 0a4e1c90
...@@ -42,7 +42,6 @@ config SND_S3C24XX_SOC_JIVE_WM8750 ...@@ -42,7 +42,6 @@ config SND_S3C24XX_SOC_JIVE_WM8750
tristate "SoC I2S Audio support for Jive" tristate "SoC I2S Audio support for Jive"
depends on SND_S3C24XX_SOC && MACH_JIVE depends on SND_S3C24XX_SOC && MACH_JIVE
select SND_SOC_WM8750 select SND_SOC_WM8750
select SND_SOC_WM8750_SPI
select SND_S3C2412_SOC_I2S select SND_S3C2412_SOC_I2S
help help
Sat Y if you want to add support for SoC audio on the Jive. Sat Y if you want to add support for SoC audio on the Jive.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment