patch-2.3.13 linux/arch/m68k/config.in

• Lines: 65
• Date: Mon Aug 9 12:27:30 1999
• Orig file: v2.3.12/linux/arch/m68k/config.in
• Orig date: Tue May 11 09:57:14 1999

diff -u --recursive --new-file v2.3.12/linux/arch/m68k/config.in linux/arch/m68k/config.in
@@ -100,7 +100,7 @@
 bool '/proc/hardware support' CONFIG_PROC_HARDWARE
 
 if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-  tristate 'Parallel port support (EXPERIMENTAL, disables old lp driver!)' CONFIG_PARPORT
+  tristate 'Parallel port support (EXPERIMENTAL)' CONFIG_PARPORT
   if [ "$CONFIG_PARPORT" != "n" ]; then
     if [ "$CONFIG_AMIGA" != "n" ]; then
       dep_tristate '   Amiga builtin port' CONFIG_PARPORT_AMIGA $CONFIG_PARPORT
@@ -118,6 +118,10 @@
   if [ "$CONFIG_ATARI" == "y" ]; then
     dep_tristate '    Atari builtin port' CONFIG_PARPORT_ATARI $CONFIG_PARPORT
   fi
+  dep_tristate 'Parallel printer support' CONFIG_PRINTER $CONFIG_PARPORT
+  if [ "$CONFIG_PRINTER" != "n" ]; then
+    bool '  Support IEEE1284 status readback' CONFIG_PRINTER_READBACK
+  fi
 fi
 
 
@@ -318,25 +322,23 @@
   define_bool CONFIG_NVRAM y
 fi
 
-if [ "$CONFIG_PARPORT" = "n" ]; then
-  tristate 'Parallel printer support' CONFIG_M68K_PRINTER
-  if [ "$CONFIG_ZORRO" = "y" ]; then
-    dep_tristate 'Multiface Card III parallel support' CONFIG_MULTIFACE_III_LP $CONFIG_M68K_PRINTER
-  fi
-else
-  dep_tristate 'Parallel printer support' CONFIG_PRINTER $CONFIG_PARPORT
-  if [ "$CONFIG_PRINTER" != "n" ]; then
-    bool '  Support IEEE1284 status readback' CONFIG_PRINTER_READBACK
-  fi
-fi   
 if [ "$CONFIG_AMIGA" = "y" ]; then
   tristate 'Amiga mouse support' CONFIG_AMIGAMOUSE
+  if [ "$CONFIG_AMIGAMOUSE" != "n" ]; then
+    define_bool CONFIG_MOUSE y
+  fi
 fi
 if [ "$CONFIG_ATARI" = "y" ]; then
   tristate 'Atari mouse support' CONFIG_ATARIMOUSE
+  if [ "$CONFIG_ATARIMOUSE" != "n" ]; then
+    define_bool CONFIG_MOUSE y
+  fi
 fi
 if [ "$CONFIG_MAC" = "y" ]; then
    bool 'Mac ADB mouse support' CONFIG_ADBMOUSE
+  if [ "$CONFIG_ADBMOUSE" != "n" ]; then
+    define_bool CONFIG_MOUSE y
+  fi
 fi
 if [ "$CONFIG_ATARI" = "y" ]; then
   tristate 'Atari MFP serial support' CONFIG_ATARI_MFPSER
@@ -374,6 +376,9 @@
   if [ "$CONFIG_SUN3X_ZS" = "y" ]; then
     bool 'Sun keyboard support' CONFIG_SUN_KEYBOARD
     bool 'Sun mouse support' CONFIG_SUN_MOUSE
+    if [ "$CONFIG_SUN_MOUSE" != "n" ]; then
+      define_bool CONFIG_MOUSE y
+    fi
     define_bool CONFIG_SBUS y
     define_bool CONFIG_SBUSCHAR y
     define_bool CONFIG_SUN_SERIAL y