tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

ALSA: opti9xx: no isapnp param for !CONFIG_PNP

"isapnp" needs CONFIG_PNP to be useful.

Signed-off-by: Rene Herman <rene.herman@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

authored by

Rene Herman and committed by
Takashi Iwai 51f6baad 82af6bc0

+4
unified split
+4
sound/isa/opti9xx/opti92x-ad1848.c
··· 68 static int index = SNDRV_DEFAULT_IDX1; /* Index 0-MAX */ 69 static char *id = SNDRV_DEFAULT_STR1; /* ID for this card */ 70 //static int enable = SNDRV_DEFAULT_ENABLE1; /* Enable this card */ 71 static int isapnp = 1; /* Enable ISA PnP detection */ 72 static long port = SNDRV_DEFAULT_PORT1; /* 0x530,0xe80,0xf40,0x604 */ 73 static long mpu_port = SNDRV_DEFAULT_PORT1; /* 0x300,0x310,0x320,0x330 */ 74 static long fm_port = SNDRV_DEFAULT_PORT1; /* 0x388 */ ··· 87 MODULE_PARM_DESC(id, "ID string for opti9xx based soundcard."); 88 //module_param(enable, bool, 0444); 89 //MODULE_PARM_DESC(enable, "Enable opti9xx soundcard."); 90 module_param(isapnp, bool, 0444); 91 MODULE_PARM_DESC(isapnp, "Enable ISA PnP detection for specified soundcard."); 92 module_param(port, long, 0444); 93 MODULE_PARM_DESC(port, "WSS port # for opti9xx driver."); 94 module_param(mpu_port, long, 0444);
··· 68 static int index = SNDRV_DEFAULT_IDX1; /* Index 0-MAX */ 69 static char *id = SNDRV_DEFAULT_STR1; /* ID for this card */ 70 //static int enable = SNDRV_DEFAULT_ENABLE1; /* Enable this card */ 71 + #ifdef CONFIG_PNP 72 static int isapnp = 1; /* Enable ISA PnP detection */ 73 + #endif 74 static long port = SNDRV_DEFAULT_PORT1; /* 0x530,0xe80,0xf40,0x604 */ 75 static long mpu_port = SNDRV_DEFAULT_PORT1; /* 0x300,0x310,0x320,0x330 */ 76 static long fm_port = SNDRV_DEFAULT_PORT1; /* 0x388 */ ··· 85 MODULE_PARM_DESC(id, "ID string for opti9xx based soundcard."); 86 //module_param(enable, bool, 0444); 87 //MODULE_PARM_DESC(enable, "Enable opti9xx soundcard."); 88 + #ifdef CONFIG_PNP 89 module_param(isapnp, bool, 0444); 90 MODULE_PARM_DESC(isapnp, "Enable ISA PnP detection for specified soundcard."); 91 + #endif 92 module_param(port, long, 0444); 93 MODULE_PARM_DESC(port, "WSS port # for opti9xx driver."); 94 module_param(mpu_port, long, 0444);