diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2013-02-06 17:24:00 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-02-07 14:46:13 +0100 |
| commit | 262d62eb55e105b6335ec0e9ba89f6ec7247cb48 (patch) | |
| tree | 50f550ce0e0041e8cab015e61d058e83d8a9ddb7 | |
| parent | 9a0869f4028916a164b1ba600e819c1dcd7c17a2 (diff) | |
| download | linux-262d62eb55e105b6335ec0e9ba89f6ec7247cb48.tar.bz2 | |
ALSA: add missing HAS_IOPORT and GENERIC_HARDIRQS dependencies
Fix these two compile errors on s390 which does not have HAS_IOPORT
nor GENERIC_HARDIRQS:
sound/pci/lx6464es/lx6464es.c: In function ‘snd_lx6464es_free’:
sound/pci/lx6464es/lx6464es.c:565:2: error: implicit declaration of function ‘ioport_unmap’
sound/soc/codecs/wm8903.c: In function ‘wm8903_set_pdata_irq_trigger’:
sound/soc/codecs/wm8903.c:1954:9: error: implicit declaration of function ‘irq_get_irq_data’
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | sound/pci/Kconfig | 1 | ||||
| -rw-r--r-- | sound/soc/codecs/Kconfig | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig index 947cfb4eb30c..fe6fa93a6262 100644 --- a/sound/pci/Kconfig +++ b/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/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 3a847828932a..615c47889092 100644 --- a/sound/soc/codecs/Kconfig +++ b/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 |