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>

diff --git a/sound/isa/msnd/msnd_pinnacle.c b/sound/isa/msnd/msnd_pinnacle.c
index 70559223e8f331855f7361a9078a5b52195ed000..60b6abd71612542e902f858955fb0a887fd19069 100644 (file)
--- a/sound/isa/msnd/msnd_pinnacle.c
+++ b/sound/isa/msnd/msnd_pinnacle.c
@@ -785,6 +785,9 @@ static int calibrate_signal;
 static int isapnp[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
 module_param_array(isapnp, bool, NULL, 0444);
 MODULE_PARM_DESC(isapnp, "ISA PnP detection for specified soundcard.");
+#define has_isapnp(x) isapnp[x]
+#else
+#define has_isapnp(x) 0
 #endif
 
 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_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");
                return -ENODEV;
        }
@@ -1082,7 +1085,7 @@ static int __devinit snd_msnd_pnp_detect(struct pnp_card_link *pcard,
        int ret;
 
        for ( ; idx < SNDRV_CARDS; idx++) {
-               if (isapnp[idx])
+               if (has_isapnp(idx))
                        break;
        }
        if (idx >= SNDRV_CARDS)