ALSA: add missing HAS_IOPORT and GENERIC_HARDIRQS dependencies
authorHeiko Carstens <heiko.carstens@de.ibm.com>
Wed, 6 Feb 2013 16:24:00 +0000 (17:24 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 7 Feb 2013 13:46:13 +0000 (14:46 +0100)
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>
sound/pci/Kconfig
sound/soc/codecs/Kconfig

index 947cfb4..fe6fa93 100644 (file)
@@ -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.
index 3a84782..615c478 100644 (file)
@@ -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