[2.6 patch] fix sound/isa/gus/interwave.c compile with PNP=n

[2.6 patch] fix sound/isa/gus/interwave.c compile with PNP=n

[Adrian Bunk]

Emmanuel Colbus sent this patch one month ago with the following 
description:

There is a trivial bug in the file sound/isa/gus/interwave.c .
The variable isapnp is defined only if CONFIG_PNP is enabled, but it is
always used few lines after.

Signed-off-by: Adrian Bunk <bunk@stusta.de>

--- a/sound/isa/gus/interwave.c	Fri Dec 24 22:34:58 2004
+++ b/sound/isa/gus/interwave.c	Wed Jan  5 14:06:53 2005
@@ -79,8 +79,10 @@
 MODULE_PARM_DESC(id, "ID string for InterWave soundcard.");
 module_param_array(enable, bool, NULL, 0444);
 MODULE_PARM_DESC(enable, "Enable InterWave soundcard.");
+#ifdef CONFIG_PNP
 module_param_array(isapnp, bool, NULL, 0444);
 MODULE_PARM_DESC(isapnp, "ISA PnP detection for specified soundcard.");
+#endif
 module_param_array(port, long, NULL, 0444);
 MODULE_PARM_DESC(port, "Port # for InterWave driver.");
 #ifdef SNDRV_STB


-------------------------------------------------------
This SF.Net email is sponsored by: IntelliVIEW -- Interactive Reporting
Tool for open source databases. Create drag-&-drop reports. Save time
by over 75%! Publish reports on the web. Export to DOC, XLS, RTF, etc.
Download a FREE copy at http://www.intelliview.com/go/osdn_nl

[2.6 patch] fix sound/isa/gus/interwave.c compile with PNP=n

[Adrian Bunk]

Emmanuel Colbus sent this patch one month ago with the following 
description:

There is a trivial bug in the file sound/isa/gus/interwave.c .
The variable isapnp is defined only if CONFIG_PNP is enabled, but it is
always used few lines after.

Signed-off-by: Adrian Bunk <bunk@stusta.de>

--- a/sound/isa/gus/interwave.c	Fri Dec 24 22:34:58 2004
+++ b/sound/isa/gus/interwave.c	Wed Jan  5 14:06:53 2005
@@ -79,8 +79,10 @@
 MODULE_PARM_DESC(id, "ID string for InterWave soundcard.");
 module_param_array(enable, bool, NULL, 0444);
 MODULE_PARM_DESC(enable, "Enable InterWave soundcard.");
+#ifdef CONFIG_PNP
 module_param_array(isapnp, bool, NULL, 0444);
 MODULE_PARM_DESC(isapnp, "ISA PnP detection for specified soundcard.");
+#endif
 module_param_array(port, long, NULL, 0444);
 MODULE_PARM_DESC(port, "Port # for InterWave driver.");
 #ifdef SNDRV_STB

Re: [Alsa-devel] [2.6 patch] fix sound/isa/gus/interwave.c compile with PNP=n

[Takashi Iwai]

At Sun, 6 Feb 2005 19:44:21 +0100,
Adrian Bunk wrote:
> 
> Emmanuel Colbus sent this patch one month ago with the following 
> description:
> 
> There is a trivial bug in the file sound/isa/gus/interwave.c .
> The variable isapnp is defined only if CONFIG_PNP is enabled, but it is
> always used few lines after.
> 
> Signed-off-by: Adrian Bunk <bunk@stusta.de>

Thanks, I applied to ALSA tree.


Takashi

Re: [2.6 patch] fix sound/isa/gus/interwave.c compile with PNP=n

[Takashi Iwai]

At Sun, 6 Feb 2005 19:44:21 +0100,
Adrian Bunk wrote:
> 
> Emmanuel Colbus sent this patch one month ago with the following 
> description:
> 
> There is a trivial bug in the file sound/isa/gus/interwave.c .
> The variable isapnp is defined only if CONFIG_PNP is enabled, but it is
> always used few lines after.
> 
> Signed-off-by: Adrian Bunk <bunk@stusta.de>

Thanks, I applied to ALSA tree.


Takashi


-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click