[PATCH] fix xconfig in 2.5.4-dj2

[PATCH] fix xconfig in 2.5.4-dj2

[René Scharfe]

Hi,

patch below allows 'make xconfig' to run successfully.

René



diff -ur linux-2.5.4-dj2/sound/Config.in linux/sound/Config.in
--- linux-2.5.4-dj2/sound/Config.in	Fri Feb 15 22:06:30 2002
+++ linux/sound/Config.in	Fri Feb 15 22:45:24 2002
@@ -19,13 +19,13 @@
   source sound/core/Config.in
   source sound/drivers/Config.in
 fi
-if [ "$CONFIG_SND" != "n" -a "$CONFIG_ISA" == "y" ]; then
+if [ "$CONFIG_SND" != "n" -a "$CONFIG_ISA" = "y" ]; then
   source sound/isa/Config.in
 fi
-if [ "$CONFIG_SND" != "n" -a "$CONFIG_PCI" == "y" ]; then
+if [ "$CONFIG_SND" != "n" -a "$CONFIG_PCI" = "y" ]; then
   source sound/pci/Config.in
 fi
-if [ "$CONFIG_SND" != "n" -a "$CONFIG_PPC" == "y" ]; then
+if [ "$CONFIG_SND" != "n" -a "$CONFIG_PPC" = "y" ]; then
   source sound/ppc/Config.in
 fi
 
diff -ur linux-2.5.4-dj2/sound/isa/Config.in linux/sound/isa/Config.in
--- linux-2.5.4-dj2/sound/isa/Config.in	Fri Feb 15 22:06:31 2002
+++ linux/sound/isa/Config.in	Fri Feb 15 22:51:34 2002
@@ -20,7 +20,7 @@
 dep_tristate 'Sound Blaster 16 (PnP)' CONFIG_SND_SB16 $CONFIG_SND
 dep_tristate 'Sound Blaster AWE (32,64) (PnP)' CONFIG_SND_SBAWE $CONFIG_SND
 if [ "$CONFIG_SND_SB16" != "n" -o "$CONFIG_SND_SBAWE" != "n" ]; then
-  dep_bool 'Sound Blaster 16/AWE CSP support' CONFIG_SND_SB16_CSP
+  dep_bool 'Sound Blaster 16/AWE CSP support' CONFIG_SND_SB16_CSP $CONFIG_SND
 fi
 dep_tristate 'Turtle Beach Maui,Tropez,Tropez+ (Wavefront)' CONFIG_SND_WAVEFRONT $CONFIG_SND
 dep_tristate 'Avance Logic ALS100/ALS120' CONFIG_SND_ALS100 $CONFIG_SND

Re: [PATCH] fix xconfig in 2.5.4-dj2

[Robert Love]

On Fri, 2002-02-15 at 17:07, René Scharfe wrote:

> patch below allows 'make xconfig' to run successfully.

I believe this is a bug in 2.5.5-pre1, so Dave just picked it up from
there.  I recall seeing a merge from Linus in his BK changelog for a fix
in pre2, too.

	Robert Love

Re: [PATCH] fix xconfig in 2.5.4-dj2

[René Scharfe]

On 15 Feb 2002 17:02:55 -0500
Robert Love <rml@tech9.net> wrote:

> On Fri, 2002-02-15 at 17:07, René Scharfe wrote:
> 
> > patch below allows 'make xconfig' to run successfully.
> 
> I believe this is a bug in 2.5.5-pre1, so Dave just picked it
> up from there. 

You are right. *sigh* Should have checked before.

> I recall seeing a merge from Linus in his BK
> changelog for a fix in pre2, too.

According to http://linux.bitkeeper.com/ these buglets are still
in Linus' tree. But after a bit of digging I found a post to LKML
from Peter Samuelson with the first part of the fix.

And my patch was incorrect, too. :( Hopefully correct version is
below.

René



diff -ur linux-2.5.4-dj2/sound/Config.in linux/sound/Config.in
--- linux-2.5.4-dj2/sound/Config.in	Fri Feb 15 22:06:30 2002
+++ linux/sound/Config.in	Fri Feb 15 22:45:24 2002
@@ -19,13 +19,13 @@
   source sound/core/Config.in
   source sound/drivers/Config.in
 fi
-if [ "$CONFIG_SND" != "n" -a "$CONFIG_ISA" == "y" ]; then
+if [ "$CONFIG_SND" != "n" -a "$CONFIG_ISA" = "y" ]; then
   source sound/isa/Config.in
 fi
-if [ "$CONFIG_SND" != "n" -a "$CONFIG_PCI" == "y" ]; then
+if [ "$CONFIG_SND" != "n" -a "$CONFIG_PCI" = "y" ]; then
   source sound/pci/Config.in
 fi
-if [ "$CONFIG_SND" != "n" -a "$CONFIG_PPC" == "y" ]; then
+if [ "$CONFIG_SND" != "n" -a "$CONFIG_PPC" = "y" ]; then
   source sound/ppc/Config.in
 fi
 
diff -ur linux-2.5.4-dj2/sound/isa/Config.in linux/sound/isa/Config.in
--- linux-2.5.4-dj2/sound/isa/Config.in	Fri Feb 15 22:06:31 2002
+++ linux/sound/isa/Config.in	Fri Feb 15 22:51:34 2002
@@ -20,7 +20,7 @@
 dep_tristate 'Sound Blaster 16 (PnP)' CONFIG_SND_SB16 $CONFIG_SND
 dep_tristate 'Sound Blaster AWE (32,64) (PnP)' CONFIG_SND_SBAWE $CONFIG_SND
 if [ "$CONFIG_SND_SB16" != "n" -o "$CONFIG_SND_SBAWE" != "n" ]; then
-  dep_bool 'Sound Blaster 16/AWE CSP support' CONFIG_SND_SB16_CSP
+  bool 'Sound Blaster 16/AWE CSP support' CONFIG_SND_SB16_CSP
 fi
 dep_tristate 'Turtle Beach Maui,Tropez,Tropez+ (Wavefront)' CONFIG_SND_WAVEFRONT $CONFIG_SND
 dep_tristate 'Avance Logic ALS100/ALS120' CONFIG_SND_ALS100 $CONFIG_SND