From bea37613401e6c0f98629b6d930b56c1ceace8a0 Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Wed, 6 Feb 2013 17:24:00 +0100 Subject: [PATCH] --- yaml --- r: 353277 b: refs/heads/master c: 262d62eb55e105b6335ec0e9ba89f6ec7247cb48 h: refs/heads/master i: 353275: 16c432d8ba7e9c298ec46862b1cea0892be5ca2f v: v3 --- [refs] | 2 +- trunk/sound/pci/Kconfig | 1 + trunk/sound/soc/codecs/Kconfig | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4d1649919470..c5ec08fbd7e3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9a0869f4028916a164b1ba600e819c1dcd7c17a2 +refs/heads/master: 262d62eb55e105b6335ec0e9ba89f6ec7247cb48 diff --git a/trunk/sound/pci/Kconfig b/trunk/sound/pci/Kconfig index 947cfb4eb30c..fe6fa93a6262 100644 --- a/trunk/sound/pci/Kconfig +++ b/trunk/sound/pci/Kconfig @@ -678,6 +678,7 @@ config SND_LOLA config SND_LX6464ES tristate "Digigram LX6464ES" + depends on HAS_IOPORT select SND_PCM help Say Y here to include support for Digigram LX6464ES boards. diff --git a/trunk/sound/soc/codecs/Kconfig b/trunk/sound/soc/codecs/Kconfig index 3a847828932a..615c47889092 100644 --- a/trunk/sound/soc/codecs/Kconfig +++ b/trunk/sound/soc/codecs/Kconfig @@ -98,7 +98,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_WM8782 select SND_SOC_WM8804 if SND_SOC_I2C_AND_SPI select SND_SOC_WM8900 if I2C - select SND_SOC_WM8903 if I2C + select SND_SOC_WM8903 if I2C && GENERIC_HARDIRQS select SND_SOC_WM8904 if I2C select SND_SOC_WM8940 if I2C select SND_SOC_WM8955 if I2C