diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-03-10 11:42:03 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-03-10 11:42:03 -0400 |
| commit | b3d7e3c99d855faf093b06dc381b821a9d8d3c23 (patch) | |
| tree | 8b8a51236ba331146e3930db5cb0b387fde7514d /sound/soc | |
| parent | eac84739721857f4d5be3d9127f4644f16a9bea4 (diff) | |
| parent | 0a4e1c9069b3cc2a9e5b57898ac9be94314e8efa (diff) | |
Merge commit 'takashi/topic/asoc' into for-2.6.30
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/s3c24xx/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/s3c24xx/Kconfig b/sound/soc/s3c24xx/Kconfig index 78d01ff487c..2f3a21eee05 100644 --- a/sound/soc/s3c24xx/Kconfig +++ b/sound/soc/s3c24xx/Kconfig | |||
| @@ -42,7 +42,6 @@ config SND_S3C24XX_SOC_JIVE_WM8750 | |||
| 42 | tristate "SoC I2S Audio support for Jive" | 42 | tristate "SoC I2S Audio support for Jive" |
| 43 | depends on SND_S3C24XX_SOC && MACH_JIVE | 43 | depends on SND_S3C24XX_SOC && MACH_JIVE |
| 44 | select SND_SOC_WM8750 | 44 | select SND_SOC_WM8750 |
| 45 | select SND_SOC_WM8750_SPI | ||
| 46 | select SND_S3C2412_SOC_I2S | 45 | select SND_S3C2412_SOC_I2S |
| 47 | help | 46 | help |
| 48 | Sat Y if you want to add support for SoC audio on the Jive. | 47 | Sat Y if you want to add support for SoC audio on the Jive. |