Merge with Linux 2.4.0-test9. Please check DECstation, I had a number

of rejects to fixup while integrating Linus patches.  I also found
that this kernel will only boot SMP on Origin; the UP kernel freeze
soon after bootup with SCSI timeout messages.  I commit this anyway
since I found that the last CVS versions had the same problem.

1 files changed, 42 insertions, 16 deletions

diff --git a/arch/ppc/config.in b/arch/ppc/config.in
index 950118eb2..0a217d4c9 100644
--- a/arch/ppc/config.in
+++ b/arch/ppc/config.in
@@ -88,11 +88,15 @@ fi
 if [ "$CONFIG_4xx" = "y" -o "$CONFIG_8xx" = "y" ]; then
   bool 'Math emulation' CONFIG_MATH_EMULATION
 fi
+
 endmenu
 
 mainmenu_option next_comment
 comment 'General setup'
 
+bool 'High memory support (experimental)' CONFIG_HIGHMEM
+bool 'Mac-on-Linux support' CONFIG_MOL
+
 define_bool CONFIG_ISA n
 define_bool CONFIG_SBUS n
 
@@ -140,20 +144,6 @@ if [ "$CONFIG_4xx" != "y" -a "$CONFIG_8xx" != "y" ]; then
     bool 'Backward compatibility mode for Xpmac' CONFIG_FB_COMPAT_XPMAC
   fi
 
-  bool 'Power management support for PowerBooks' CONFIG_PMAC_PBOOK
-  bool 'Support for PowerMac floppy' CONFIG_MAC_FLOPPY
-  tristate 'Support for PowerMac serial ports' CONFIG_MAC_SERIAL
-  if [ "$CONFIG_MAC_SERIAL" = "y" ]; then
-     bool '   Support for console on serial port' CONFIG_SERIAL_CONSOLE
-  fi
-  bool 'Apple Desktop Bus (ADB) support' CONFIG_ADB
-  if [ "$CONFIG_ADB" = "y" ]; then
-     bool '   Include CUDA ADB driver' CONFIG_ADB_CUDA
-     bool '   Include MacIO ADB driver' CONFIG_ADB_MACIO
-     bool '   Include PMU (Powerbook) ADB driver' CONFIG_ADB_PMU
-     bool 'Support for ADB keyboard' CONFIG_ADB_KEYBOARD 
-     bool 'Support for ADB mouse' CONFIG_ADBMOUSE
-  fi
   tristate 'Support for /dev/rtc' CONFIG_PPC_RTC
   bool 'Support for Open Firmware device tree in /proc' CONFIG_PROC_DEVICETREE
   bool 'Support for early boot text console (BootX only)' CONFIG_BOOTX_TEXT
@@ -192,7 +182,7 @@ endmenu
 source drivers/mtd/Config.in
 source drivers/pnp/Config.in
 source drivers/block/Config.in
-#source drivers.new/Config.in
+source drivers/md/Config.in
 
 if [ "$CONFIG_NET" = "y" ]; then
   source net/Config.in
@@ -262,6 +252,43 @@ comment 'Console drivers'
 source drivers/video/Config.in
 endmenu
 
+source drivers/input/Config.in
+
+mainmenu_option next_comment
+comment 'Macintosh device drivers'
+
+if [ "$CONFIG_ALL_PPC" = "y" ]; then
+  # we want to change this to something like CONFIG_SYSCTRL_CUDA/PMU
+  bool 'Support for CUDA based PowerMacs' CONFIG_ADB_CUDA
+  bool 'Support for PMU  based PowerMacs' CONFIG_ADB_PMU
+  if [ "$CONFIG_ADB_PMU" = "y" ]; then
+     bool '   Power management support for PowerBooks' CONFIG_PMAC_PBOOK
+     # made a separate option since backlight may end up beeing used
+     # on non-powerbook machines (but only on PMU based ones AFAIK)
+     bool '   Backlight control for LCD screens' CONFIG_PMAC_BACKLIGHT
+  fi
+  bool 'Support for PowerMac floppy' CONFIG_MAC_FLOPPY
+  tristate 'Support for PowerMac serial ports' CONFIG_MAC_SERIAL
+  if [ "$CONFIG_MAC_SERIAL" = "y" ]; then
+     bool '   Support for console on serial port' CONFIG_SERIAL_CONSOLE
+  fi
+  bool 'Apple Desktop Bus (ADB) support' CONFIG_ADB
+  if [ "$CONFIG_ADB" = "y" ]; then
+     bool '   Include MacIO (CHRP) ADB driver' CONFIG_ADB_MACIO
+  fi
+fi
+if [ "$CONFIG_ADB" = "y" ]; then
+  dep_bool '   Use input layer for ADB devices' CONFIG_INPUT_ADBHID $CONFIG_INPUT
+  if [ "$CONFIG_INPUT_ADBHID" = "y" ]; then
+     define_bool CONFIG_MAC_HID y
+     bool '     Support for ADB raw keycodes' CONFIG_MAC_ADBKEYCODES
+     bool '     Support for mouse button 2+3 emulation' CONFIG_MAC_EMUMOUSEBTN
+  else
+     bool '   Support for ADB keyboard (old driver)' CONFIG_ADB_KEYBOARD
+  fi
+fi
+endmenu
+
 source drivers/char/Config.in
 
 source drivers/media/Config.in
@@ -287,7 +314,6 @@ source arch/ppc/8260_io/Config.in
 fi
 
 source drivers/usb/Config.in
-source drivers/input/Config.in
 
 mainmenu_option next_comment
 comment 'Kernel hacking'