diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-03-10 16:42:03 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-03-10 16:42:03 +0100 |
| commit | b3d7e3c99d855faf093b06dc381b821a9d8d3c23 (patch) | |
| tree | 8b8a51236ba331146e3930db5cb0b387fde7514d /sound/soc | |
| parent | ASoC: Fix Samsung S3C2412_IISMOD_SDF_{MSB,LSB} definitions (diff) | |
| parent | Merge branch 'for-2.6.30' of git://git.kernel.org/pub/scm/linux/kernel/git/br... (diff) | |
| download | linux-b3d7e3c99d855faf093b06dc381b821a9d8d3c23.tar.xz linux-b3d7e3c99d855faf093b06dc381b821a9d8d3c23.zip | |
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 78d01ff487cf..2f3a21eee051 100644 --- a/sound/soc/s3c24xx/Kconfig +++ b/sound/soc/s3c24xx/Kconfig @@ -42,7 +42,6 @@ config SND_S3C24XX_SOC_JIVE_WM8750 tristate "SoC I2S Audio support for Jive" depends on SND_S3C24XX_SOC && MACH_JIVE select SND_SOC_WM8750 - select SND_SOC_WM8750_SPI select SND_S3C2412_SOC_I2S help Sat Y if you want to add support for SoC audio on the Jive. |