diff options
author | Rene Herman <rene.herman@gmail.com> | 2008-07-18 05:15:12 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-07-18 06:01:45 -0400 |
commit | 51f6baad264ca4bacdbf4fa25c676fa30d344bfa (patch) | |
tree | 918a6cf31f94eea02c9a99c701cea1dd0da06532 /sound | |
parent | 82af6bc0986c5140efc875b2d91326031f0254ab (diff) |
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')
-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 d20abb286124..0797ca441a37 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)}," | |||
68 | static int index = SNDRV_DEFAULT_IDX1; /* Index 0-MAX */ | 68 | static int index = SNDRV_DEFAULT_IDX1; /* Index 0-MAX */ |
69 | static char *id = SNDRV_DEFAULT_STR1; /* ID for this card */ | 69 | static char *id = SNDRV_DEFAULT_STR1; /* ID for this card */ |
70 | //static int enable = SNDRV_DEFAULT_ENABLE1; /* Enable this card */ | 70 | //static int enable = SNDRV_DEFAULT_ENABLE1; /* Enable this card */ |
71 | #ifdef CONFIG_PNP | ||
71 | static int isapnp = 1; /* Enable ISA PnP detection */ | 72 | static int isapnp = 1; /* Enable ISA PnP detection */ |
73 | #endif | ||
72 | static long port = SNDRV_DEFAULT_PORT1; /* 0x530,0xe80,0xf40,0x604 */ | 74 | static long port = SNDRV_DEFAULT_PORT1; /* 0x530,0xe80,0xf40,0x604 */ |
73 | static long mpu_port = SNDRV_DEFAULT_PORT1; /* 0x300,0x310,0x320,0x330 */ | 75 | static long mpu_port = SNDRV_DEFAULT_PORT1; /* 0x300,0x310,0x320,0x330 */ |
74 | static long fm_port = SNDRV_DEFAULT_PORT1; /* 0x388 */ | 76 | static long fm_port = SNDRV_DEFAULT_PORT1; /* 0x388 */ |
@@ -85,8 +87,10 @@ module_param(id, charp, 0444); | |||
85 | MODULE_PARM_DESC(id, "ID string for opti9xx based soundcard."); | 87 | MODULE_PARM_DESC(id, "ID string for opti9xx based soundcard."); |
86 | //module_param(enable, bool, 0444); | 88 | //module_param(enable, bool, 0444); |
87 | //MODULE_PARM_DESC(enable, "Enable opti9xx soundcard."); | 89 | //MODULE_PARM_DESC(enable, "Enable opti9xx soundcard."); |
90 | #ifdef CONFIG_PNP | ||
88 | module_param(isapnp, bool, 0444); | 91 | module_param(isapnp, bool, 0444); |
89 | MODULE_PARM_DESC(isapnp, "Enable ISA PnP detection for specified soundcard."); | 92 | MODULE_PARM_DESC(isapnp, "Enable ISA PnP detection for specified soundcard."); |
93 | #endif | ||
90 | module_param(port, long, 0444); | 94 | module_param(port, long, 0444); |
91 | MODULE_PARM_DESC(port, "WSS port # for opti9xx driver."); | 95 | MODULE_PARM_DESC(port, "WSS port # for opti9xx driver."); |
92 | module_param(mpu_port, long, 0444); | 96 | module_param(mpu_port, long, 0444); |