Merge branch 'for-2.6.30' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

diff --git a/sound/soc/s3c24xx/Kconfig b/sound/soc/s3c24xx/Kconfig
index 78d01ff..2f3a21e 100644 (file)
--- 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.