[Linuxconsole-commit]CVS: ruby/linux/arch/m68k config.in,1.12,1.13

[James S. <jsi...@us...>]

Update of /cvsroot/linuxconsole/ruby/linux/arch/m68k
In directory usw-pr-cvs1:/tmp/cvs-serv23561/arch/m68k

Modified Files:
	config.in 
Log Message:
Synced to 2.5.X.

Index: config.in
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/m68k/config.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- config.in	2001/07/08 00:41:51	1.12
+++ config.in	2002/01/20 03:54:45	1.13
@@ -165,8 +165,6 @@
    source net/Config.in
 fi
 
-source drivers/input/Config.in
-
 mainmenu_option next_comment
 comment 'ATA/IDE/MFM/RLL support'
 
@@ -357,6 +355,8 @@
 
 fi
 
+source drivers/input/Config.in
+
 mainmenu_option next_comment
 comment 'Character devices'
  
@@ -377,7 +377,7 @@
 fi
 
 if [ "$CONFIG_VME" = "n" -a "$CONFIG_INPUT" = "y" ]; then
-   bool 'Virtual terminal' CONFIG_VT	
+   define_bool CONFIG_VT y
    if [ "$CONFIG_VT" = "y" ]; then
       bool 'Support for console on virtual terminal' CONFIG_VT_CONSOLE
    fi
@@ -436,13 +436,10 @@
    define_bool CONFIG_SUN3X_ZS n
 fi
 if [ "$CONFIG_SUN3X_ZS" = "y" ]; then
-   define_bool CONFIG_INPUT_SUNKBD y
    define_bool CONFIG_SBUS y
    define_bool CONFIG_SBUSCHAR y
    define_bool CONFIG_SUN_SERIAL y
 else
-   define_bool CONFIG_INPUT_SUNKBD n
-   define_bool CONFIG_SUN_MOUSE n
    define_bool CONFIG_SBUS n
 fi
 
@@ -517,3 +514,5 @@
 #bool 'Debug kmalloc/kfree' CONFIG_DEBUG_MALLOC
 bool 'Magic SysRq key' CONFIG_MAGIC_SYSRQ
 endmenu
+
+source lib/Config.in