2.4.0test13pre4-ac2 fix for CONFIG_SOUND_YMFPCI problem

With 2.4.0-test13-pre4-ac2, I get the following error with make xconfig:

make[1]: Leaving directory `/usr/src/linux-2.4.0-test13-pre4-ac2/scripts' wish -f scripts/kconfig.tk
ERROR - Attempting to write value for unconfigured variable (CONFIG_SOUND_YMFPCI).

It appears that in the 2.4.0test13pre4-ac2 patch, the method of configuring CONFIG_SOUND_YMFPCI was changed by adding a
dep_tristate ' Yamaha PCI native mode support (EXPERIMENTAL)' and an if test at lines 82-84 of drivers/sound/Config.in.

However, the old code with a
dep_tristate ' Yamaha YMF7xx PCI audio (native mode) (EXPERIMENTAL)'
and associated if test at lines 149-151 remained in the Config.in file.

It seems that these two sections of code are interferring with each other.

The following patch removes the older section of code associated with CONFIG_SOUND_YMFPCI.

Due to the very long lines, this patch may suffer readability due to wraparounds, so I will attach a copy.

Steven

diff -u linux/drivers/sound/Config.in.orig linux/drivers/sound/Config.in
@@ -146,9 +146,6 @@
    dep_tristate '    Yamaha OPL3-SA1 audio controller' CONFIG_SOUND_OPL3SA1 

$CONFIG_SOUND_OSS
dep_tristate ' Yamaha OPL3-SA2, SA3, and SAx based PnP cards'
CONFIG_SOUND_OPL3SA2 $CONFIG_SOUND_OSS
dep_tristate ' Yamaha YMF7xx PCI audio (legacy mode)'
CONFIG_SOUND_YMPCI $CONFIG_SOUND_OSS $CONFIG_PCI
- if [ "$CONFIG_SOUND_YMPCI" = "n" ]; then
- dep_tristate ' Yamaha YMF7xx PCI audio (native mode)
(EXPERIMENTAL)' CONFIG_SOUND_YMFPCI $CONFIG_SOUND_OSS $CONFIG_PCI $CONFIG_EXPERIMENTAL
- fi
dep_tristate ' 6850 UART support' CONFIG_SOUND_UART6850
$CONFIG_SOUND_OSS

dep_tristate ' Gallant Audio Cards (SC-6000 and SC-6600 based)'
CONFIG_SOUND_AEDSP16 $CONFIG_SOUND_OSS

diff -u linux/drivers/sound/Config.in.orig linux/drivers/sound/Config.in
@@ -146,9 +146,6 @@
    dep_tristate '    Yamaha OPL3-SA1 audio controller' CONFIG_SOUND_OPL3SA1 $CONFIG_SOUND_OSS
    dep_tristate '    Yamaha OPL3-SA2, SA3, and SAx based PnP cards' CONFIG_SOUND_OPL3SA2 $CONFIG_SOUND_OSS
    dep_tristate '    Yamaha YMF7xx PCI audio (legacy mode)' CONFIG_SOUND_YMPCI $CONFIG_SOUND_OSS $CONFIG_PCI
-   if [ "$CONFIG_SOUND_YMPCI" = "n" ]; then
-      dep_tristate '    Yamaha YMF7xx PCI audio (native mode) (EXPERIMENTAL)' CONFIG_SOUND_YMFPCI $CONFIG_SOUND_OSS $CONFIG_PCI $CONFIG_EXPERIMENTAL
-   fi
    dep_tristate '    6850 UART support' CONFIG_SOUND_UART6850 $CONFIG_SOUND_OSS
   
    dep_tristate '    Gallant Audio Cards (SC-6000 and SC-6600 based)' CONFIG_SOUND_AEDSP16 $CONFIG_SOUND_OSS