Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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>
Heiko Carstens 12 years ago
parent
9a0869f402
commit
262d62eb55
2 changed files with 2 additions and 1 deletions
Split View Show Diff Stats
  1. 1 0
      sound/pci/Kconfig
  2. 1 1
      sound/soc/codecs/Kconfig

+ 1 - 0
sound/pci/Kconfig
View 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.

+ 1 - 1
sound/soc/codecs/Kconfig
View 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