make xmenuconfig is broken

[Jun Sun <jsun@mvista.com>]

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


There is an obvious typo.  

In addition, there are two SERIAL and SERIAL_CONSOLE related 
setting which should be in drivers/char/Config.in
instead of arch/mips/config-shared.in.

The following hack makes xmenuconfig work again, apparently breaking
decstation and IP22.  If nobody interested in those two machines
move the config, I will make an attempt to do so.

BTW, the symptom without the later two hacks is that you can set
SERIAL or SERIAL_CONSOLE options in xmenuconfig.

Any comments?

Jun

[-- Attachment #2: junk --]
[-- Type: text/plain, Size: 2050 bytes --]

diff -Nru arch/mips/config-shared.in.orig arch/mips/config-shared.in
--- arch/mips/config-shared.in.orig	Sun Oct  6 05:28:03 2002
+++ arch/mips/config-shared.in	Tue Oct 29 10:29:14 2002
@@ -513,7 +513,7 @@
 if [ "$CONFIG_CPU_SB1" = "y" ]; then
    choice 'SB1 Pass' \
 	 "Pass1   CONFIG_CPU_SB1_PASS_1  \
-	  Pass2   CONFIG_CPU_SB1_PASS_2
+	  Pass2   CONFIG_CPU_SB1_PASS_2  \
 	  Pass2.2 CONFIG_CPU_SB1_PASS_2_2" Pass1
    if [ "$CONFIG_CPU_SB1_PASS_1" = "y" ]; then
       define_bool CONFIG_SB1_PASS_1_WORKAROUNDS y
@@ -764,18 +764,18 @@
 
 #source drivers/misc/Config.in
 
-if [ "$CONFIG_DECSTATION" = "y" ]; then
-   mainmenu_option next_comment
-   comment 'DECStation Character devices'
-
-   tristate 'Standard/generic (dumb) serial support' CONFIG_SERIAL
-   dep_bool '  DZ11 Serial Support' CONFIG_DZ $CONFIG_SERIAL
-   dep_bool '  Z85C30 Serial Support' CONFIG_ZS $CONFIG_SERIAL $CONFIG_TC
-   dep_bool '  Support for console on serial port' CONFIG_SERIAL_CONSOLE $CONFIG_SERIAL
-#   dep_bool 'MAXINE Access.Bus mouse (VSXXX-BB/GB) support' CONFIG_DTOP_MOUSE $CONFIG_ACCESSBUS
-   bool 'Enhanced Real Time Clock Support' CONFIG_RTC
-   endmenu
-fi
+#if [ "$CONFIG_DECSTATION" = "y" ]; then
+#   mainmenu_option next_comment
+#   comment 'DECStation Character devices'
+#
+#   tristate 'Standard/generic (dumb) serial support' CONFIG_SERIAL
+#   dep_bool '  DZ11 Serial Support' CONFIG_DZ $CONFIG_SERIAL
+#   dep_bool '  Z85C30 Serial Support' CONFIG_ZS $CONFIG_SERIAL $CONFIG_TC
+#   dep_bool '  Support for console on serial port' CONFIG_SERIAL_CONSOLE $CONFIG_SERIAL
+##   dep_bool 'MAXINE Access.Bus mouse (VSXXX-BB/GB) support' CONFIG_DTOP_MOUSE $CONFIG_ACCESSBUS
+#   bool 'Enhanced Real Time Clock Support' CONFIG_RTC
+#   endmenu
+#fi
 
 if [ "$CONFIG_SGI_IP22" = "y" ]; then
    mainmenu_option next_comment
@@ -814,9 +814,9 @@
 fi
 endmenu
 
-if [ "$CONFIG_SGI_IP22" = "y" ]; then
-   source drivers/sgi/Config.in
-fi
+#if [ "$CONFIG_SGI_IP22" = "y" ]; then
+#   source drivers/sgi/Config.in
+#fi
 
 source drivers/usb/Config.in