[PATCH][2.4.21-pre5]: make xconfig fails on drivers/net/Config.in

[PATCH][2.4.21-pre5]: make xconfig fails on drivers/net/Config.in

[Andreas Haumer]

[-- Attachment #1: Type: text/plain, Size: 1436 bytes --]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi!

As the subject says: "make xconfig" complains about an
"unknown command" in drivers/net/Config.in

root@install:/usr/src/linux-2.4.21-pre5 {506} $ make xconfig
rm -f include/asm
( cd include ; ln -sf asm-i386 asm)
make -C scripts kconfig.tk
make[1]: Entering directory `/usr/src/linux-2.4.21-pre5-ac1/scripts'
cat header.tk >> ./kconfig.tk
./tkparse < ../arch/i386/config.in >> kconfig.tk
drivers/net/Config.in: 188: unknown command
make[1]: *** [kconfig.tk] Error 1
make[1]: Leaving directory `/usr/src/linux-2.4.21-pre5-ac1/scripts'
make: *** [xconfig] Error 2

It turns out, "make xconfig" doesn't know the token "define_mbool",
used in this file. "make menuconfig" works without complaints...

The attached patch makes it work even with "make xconfig"
(changes "define_mbool" to "define_bool"), though I don't
know if this maintains the intended behaviour. Please check.

- - andreas

- --
Andreas Haumer                     | mailto:andreas@xss.co.at
*x Software + Systeme              | http://www.xss.co.at/
Karmarschgasse 51/2/20             | Tel: +43-1-6060114-0
A-1100 Vienna, Austria             | Fax: +43-1-6060114-71
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.7 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQE+Y7MfxJmyeGcXPhERAu5HAJ9LrCFw7VSxE63YDTICNEkcrnJWLQCdFtiF
BmO0DBhqFT+HVr0Da1Eq9EQ=
=clCd
-----END PGP SIGNATURE-----

[-- Attachment #2: Config.in.diff --]
[-- Type: text/plain, Size: 606 bytes --]

--- linux-2.4.21-pre5/drivers/net/Config.in.orig	Mon Mar  3 20:26:07 2003
+++ linux-2.4.21-pre5/drivers/net/Config.in	Mon Mar  3 20:26:23 2003
@@ -185,7 +185,7 @@
       dep_tristate '    Davicom DM910x/DM980x support' CONFIG_DM9102 $CONFIG_PCI
       dep_tristate '    EtherExpressPro/100 support (eepro100, original Becker driver)' CONFIG_EEPRO100 $CONFIG_PCI
       if [ "$CONFIG_VISWS" = "y" ]; then
-         define_mbool CONFIG_EEPRO100_PIO y
+         define_bool CONFIG_EEPRO100_PIO y
       else
          dep_mbool '      Use PIO instead of MMIO' CONFIG_EEPRO100_PIO $CONFIG_EEPRO100
       fi