OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ALSA: msnd - Fix build error with CONFIG_PNP=n 

sound/isa/msnd/msnd_pinnacle.c:891: error: 'isapnp' undeclared (first use in this function)

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2009-02-04 18:28:42 +01:00
parent 5aa13a9409
commit 5e7476243a
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sound/isa/msnd/msnd_pinnacle.c
View File

@ -785,6 +785,9 @@ static int calibrate_signal;
static int isapnp[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; static int isapnp[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
module_param_array(isapnp, bool, NULL, 0444); module_param_array(isapnp, bool, NULL, 0444);
MODULE_PARM_DESC(isapnp, "ISA PnP detection for specified soundcard."); MODULE_PARM_DESC(isapnp, "ISA PnP detection for specified soundcard.");
#define has_isapnp(x) isapnp[x]
#else
#define has_isapnp(x) 0
#endif #endif
MODULE_AUTHOR("Karsten Wiese <annabellesgarden@yahoo.de>"); MODULE_AUTHOR("Karsten Wiese <annabellesgarden@yahoo.de>");
@ -888,7 +891,7 @@ static int __devinit snd_msnd_isa_probe(struct device *pdev, unsigned int idx)
struct snd_card *card; struct snd_card *card;
struct snd_msnd *chip; struct snd_msnd *chip;
if (isapnp[idx] || cfg[idx] == SNDRV_AUTO_PORT) { if (has_isapnp(idx) || cfg[idx] == SNDRV_AUTO_PORT) {
printk(KERN_INFO LOGNAME ": Assuming PnP mode\n"); printk(KERN_INFO LOGNAME ": Assuming PnP mode\n");
return -ENODEV; return -ENODEV;
} }
@ -1082,7 +1085,7 @@ static int __devinit snd_msnd_pnp_detect(struct pnp_card_link *pcard,
int ret; int ret;
for ( ; idx < SNDRV_CARDS; idx++) { for ( ; idx < SNDRV_CARDS; idx++) {
if (isapnp[idx]) if (has_isapnp(idx))
break; break;
} }
if (idx >= SNDRV_CARDS) if (idx >= SNDRV_CARDS)