Merge with 2.3.19.

1 files changed, 26 insertions, 17 deletions

diff --git a/arch/m68k/config.in b/arch/m68k/config.in
index a8dacc904..54e8448d3 100644
--- a/arch/m68k/config.in
+++ b/arch/m68k/config.in
@@ -48,9 +48,6 @@ fi
 bool 'Sun3x support' CONFIG_SUN3X
   
 define_bool CONFIG_SUN3 n
-if [ "$CONFIG_PCI" = "y" ]; then
-  bool 'Backward-compatible /proc/pci' CONFIG_PCI_OLD_PROC
-fi
 bool 'Q40/Q60 support' CONFIG_Q40
 
 comment 'Processor type'
@@ -58,6 +55,13 @@ bool '68020 support' CONFIG_M68020
 bool '68030 support' CONFIG_M68030
 bool '68040 support' CONFIG_M68040
 bool '68060 support' CONFIG_M68060
+if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
+  bool 'Math emulation support' CONFIG_M68KFPU_EMU
+  if [ "$CONFIG_M68KFPU_EMU" = "y" ]; then
+    bool 'Math emulation extra precision' CONFIG_M68KFPU_EMU_EXTRAPREC
+    bool 'Math emulation only kernel' CONFIG_M68KFPU_EMU_ONLY
+  fi
+fi
 bool 'Advanced configuration options' CONFIG_ADVANCED
 if [ "$CONFIG_ADVANCED" = "y" ]; then
   bool 'Use read-modify-write instructions' CONFIG_RMW_INSNS
@@ -100,7 +104,7 @@ fi
 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 +122,10 @@ if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
   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
 
 
@@ -190,8 +198,8 @@ if [ "$CONFIG_ATARI" = "y" ]; then
   fi
 fi
 if [ "$CONFIG_MAC" = "y" ]; then
-  bool 'MAC NCR5380 SCSI' CONFIG_MAC_SCSI
-  dep_tristate 'MAC NCR53c9[46] SCSI' CONFIG_SCSI_MAC_ESP $CONFIG_SCSI
+  bool 'Macintosh NCR5380 SCSI' CONFIG_MAC_SCSI
+  dep_tristate 'Macintosh NCR53c9[46] SCSI' CONFIG_SCSI_MAC_ESP $CONFIG_SCSI
 fi
 #dep_tristate 'SCSI debugging host adapter' CONFIG_SCSI_DEBUG $CONFIG_SCSI
 
@@ -318,25 +326,23 @@ if [ "$CONFIG_ATARI" = "y" ]; then
   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_BUSMOUSE y
+  fi
 fi
 if [ "$CONFIG_ATARI" = "y" ]; then
   tristate 'Atari mouse support' CONFIG_ATARIMOUSE
+  if [ "$CONFIG_ATARIMOUSE" != "n" ]; then
+    define_bool CONFIG_BUSMOUSE y
+  fi
 fi
 if [ "$CONFIG_MAC" = "y" ]; then
    bool 'Mac ADB mouse support' CONFIG_ADBMOUSE
+  if [ "$CONFIG_ADBMOUSE" != "n" ]; then
+    define_bool CONFIG_BUSMOUSE y
+  fi
 fi
 if [ "$CONFIG_ATARI" = "y" ]; then
   tristate 'Atari MFP serial support' CONFIG_ATARI_MFPSER
@@ -374,6 +380,9 @@ if [ "$CONFIG_SUN3X" = "y" ]; then
   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_BUSMOUSE y
+    fi
     define_bool CONFIG_SBUS y
     define_bool CONFIG_SBUSCHAR y
     define_bool CONFIG_SUN_SERIAL y