From 0de8ae57ae58e98118383184fda00f7d26b57ba5 Mon Sep 17 00:00:00 2001 From: Rene Herman Date: Fri, 18 Jul 2008 11:15:12 +0200 Subject: [PATCH] --- yaml --- r: 106479 b: refs/heads/master c: 51f6baad264ca4bacdbf4fa25c676fa30d344bfa h: refs/heads/master i: 106477: 66a85130730c784d60549a0649f2741dcad14386 106475: fe793b86d8a28aaa18ac3a91133ba8e96e483767 106471: 7c672c77c5b90b8caedfde10de964834c3130476 106463: 036e73e2eb97522935eaa43c8c911ee09595e953 v: v3 --- [refs] | 2 +- trunk/sound/isa/opti9xx/opti92x-ad1848.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 88b68bdba741..0aa894cc48b3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 82af6bc0986c5140efc875b2d91326031f0254ab +refs/heads/master: 51f6baad264ca4bacdbf4fa25c676fa30d344bfa diff --git a/trunk/sound/isa/opti9xx/opti92x-ad1848.c b/trunk/sound/isa/opti9xx/opti92x-ad1848.c index d20abb286124..0797ca441a37 100644 --- a/trunk/sound/isa/opti9xx/opti92x-ad1848.c +++ b/trunk/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);