diff options
| author | Rene Herman <rene.herman@gmail.com> | 2008-07-18 11:15:12 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-07-18 12:01:45 +0200 |
| commit | 51f6baad264ca4bacdbf4fa25c676fa30d344bfa (patch) | |
| tree | 918a6cf31f94eea02c9a99c701cea1dd0da06532 /sound/isa | |
| parent | 82af6bc0986c5140efc875b2d91326031f0254ab (diff) | |
| download | kernel_samsung_espresso10-51f6baad264ca4bacdbf4fa25c676fa30d344bfa.zip kernel_samsung_espresso10-51f6baad264ca4bacdbf4fa25c676fa30d344bfa.tar.gz kernel_samsung_espresso10-51f6baad264ca4bacdbf4fa25c676fa30d344bfa.tar.bz2 | |
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>
Diffstat (limited to 'sound/isa')
| -rw-r--r-- | sound/isa/opti9xx/opti92x-ad1848.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c index d20abb2..0797ca4 100644 --- a/sound/isa/opti9xx/opti92x-ad1848.c +++ b/sound/isa/opti9xx/opti92x-ad1848.c @@ -68,7 +68,9 @@ MODULE_SUPPORTED_DEVICE("{{OPTi,82C924 (AD1848)}," static int index = SNDRV_DEFAULT_IDX1; /* Index 0-MAX */ static char *id = SNDRV_DEFAULT_STR1; /* ID for this card */ //static int enable = SNDRV_DEFAULT_ENABLE1; /* Enable this card */ +#ifdef CONFIG_PNP static int isapnp = 1; /* Enable ISA PnP detection */ +#endif static long port = SNDRV_DEFAULT_PORT1; /* 0x530,0xe80,0xf40,0x604 */ static long mpu_port = SNDRV_DEFAULT_PORT1; /* 0x300,0x310,0x320,0x330 */ static long fm_port = SNDRV_DEFAULT_PORT1; /* 0x388 */ @@ -85,8 +87,10 @@ module_param(id, charp, 0444); MODULE_PARM_DESC(id, "ID string for opti9xx based soundcard."); //module_param(enable, bool, 0444); //MODULE_PARM_DESC(enable, "Enable opti9xx soundcard."); +#ifdef CONFIG_PNP module_param(isapnp, bool, 0444); MODULE_PARM_DESC(isapnp, "Enable ISA PnP detection for specified soundcard."); +#endif module_param(port, long, 0444); MODULE_PARM_DESC(port, "WSS port # for opti9xx driver."); module_param(mpu_port, long, 0444); |