diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-02-04 12:28:42 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-02-04 12:28:42 -0500 |
commit | 5e7476243ad755fa1d8be2b1774d0aeb16bb48df (patch) | |
tree | 59c10ef033c524b714af4652afb8c02fde6d7fed /sound/isa | |
parent | 5aa13a94098ef5fc1bb0a7f531fdda8864ae67ff (diff) |
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>
Diffstat (limited to 'sound/isa')
-rw-r--r-- | sound/isa/msnd/msnd_pinnacle.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sound/isa/msnd/msnd_pinnacle.c b/sound/isa/msnd/msnd_pinnacle.c index 70559223e8f3..60b6abd71612 100644 --- a/sound/isa/msnd/msnd_pinnacle.c +++ b/sound/isa/msnd/msnd_pinnacle.c | |||
@@ -785,6 +785,9 @@ static int calibrate_signal; | |||
785 | static int isapnp[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; | 785 | static int isapnp[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; |
786 | module_param_array(isapnp, bool, NULL, 0444); | 786 | module_param_array(isapnp, bool, NULL, 0444); |
787 | MODULE_PARM_DESC(isapnp, "ISA PnP detection for specified soundcard."); | 787 | MODULE_PARM_DESC(isapnp, "ISA PnP detection for specified soundcard."); |
788 | #define has_isapnp(x) isapnp[x] | ||
789 | #else | ||
790 | #define has_isapnp(x) 0 | ||
788 | #endif | 791 | #endif |
789 | 792 | ||
790 | MODULE_AUTHOR("Karsten Wiese <annabellesgarden@yahoo.de>"); | 793 | MODULE_AUTHOR("Karsten Wiese <annabellesgarden@yahoo.de>"); |
@@ -888,7 +891,7 @@ static int __devinit snd_msnd_isa_probe(struct device *pdev, unsigned int idx) | |||
888 | struct snd_card *card; | 891 | struct snd_card *card; |
889 | struct snd_msnd *chip; | 892 | struct snd_msnd *chip; |
890 | 893 | ||
891 | if (isapnp[idx] || cfg[idx] == SNDRV_AUTO_PORT) { | 894 | if (has_isapnp(idx) || cfg[idx] == SNDRV_AUTO_PORT) { |
892 | printk(KERN_INFO LOGNAME ": Assuming PnP mode\n"); | 895 | printk(KERN_INFO LOGNAME ": Assuming PnP mode\n"); |
893 | return -ENODEV; | 896 | return -ENODEV; |
894 | } | 897 | } |
@@ -1082,7 +1085,7 @@ static int __devinit snd_msnd_pnp_detect(struct pnp_card_link *pcard, | |||
1082 | int ret; | 1085 | int ret; |
1083 | 1086 | ||
1084 | for ( ; idx < SNDRV_CARDS; idx++) { | 1087 | for ( ; idx < SNDRV_CARDS; idx++) { |
1085 | if (isapnp[idx]) | 1088 | if (has_isapnp(idx)) |
1086 | break; | 1089 | break; |
1087 | } | 1090 | } |
1088 | if (idx >= SNDRV_CARDS) | 1091 | if (idx >= SNDRV_CARDS) |