[Linuxconsole-commit]CVS: ruby/linux/arch/ppc Config.help,1.7,1.8 config.in,1.35,1.36

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

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

Modified Files:
	Config.help config.in 
Log Message:
Synced to 2.5.26

Index: Config.help
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/Config.help,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Config.help	10 Jul 2002 18:08:02 -0000	1.7
+++ Config.help	23 Jul 2002 19:18:48 -0000	1.8
@@ -280,19 +280,6 @@
   answer will get "defaulted" for you if you enable any of the Linux
   CD-ROM drivers).
 
-CONFIG_INPUT_ADBHID
-  Say Y here if you want to have ADB (Apple Desktop Bus) HID devices
-  such as keyboards, mice, joysticks, or graphic tablets handled by
-  the input layer.  If you say Y here, make sure to say Y to the
-  corresponding drivers "Keyboard support" (CONFIG_INPUT_KEYBDEV),
-  "Mouse Support" (CONFIG_INPUT_MOUSEDEV) and "Event interface
-  support" (CONFIG_INPUT_EVDEV) as well.
-
-  If you say N here, you still have the option of using the old ADB
-  keyboard and mouse drivers.
-
-  If unsure, say Y.
-
 CONFIG_PREP_RESIDUAL
   Some PReP systems have residual data passed to the kernel by the
   firmware.  This allows detection of memory size, devices present and
@@ -341,6 +328,27 @@
   also includes a MESH II SCSI controller, DBDMA controller, VIA chip,
   OpenPIC controller and two RS422/Geoports.)
 
+CONFIG_INPUT_ADBHID
+  Say Y here if you want to have ADB (Apple Desktop Bus) HID devices
+  such as keyboards, mice, joysticks, trackpads  or graphic tablets
+  handled by the input layer.  If you say Y here, make sure to say Y to
+  the corresponding drivers "Keyboard support" (CONFIG_INPUT_KEYBDEV),
+  "Mouse Support" (CONFIG_INPUT_MOUSEDEV) and "Event interface
+  support" (CONFIG_INPUT_EVDEV) as well.
+
+  If unsure, say Y.
+
+CONFIG_MAC_EMUMOUSEBTN
+  This provides generic support for emulating the 2nd and 3rd mouse
+  button with keypresses.  If you say Y here, the emulation is still
+  disabled by default.  The emulation is controlled by these sysctl
+  entries:
+      /proc/sys/dev/mac_hid/mouse_button_emulation
+      /proc/sys/dev/mac_hid/mouse_button2_keycode
+      /proc/sys/dev/mac_hid/mouse_button3_keycode
+
+  If you have an Apple machine with a 1-button mouse, say Y here.
+
 CONFIG_SERIAL_CONSOLE
   If you say Y here, it will be possible to use a serial port as the
   system console (the system console is the device which receives all
@@ -800,28 +808,6 @@
     Date of Release: early 2001 (?)
     End of life: -
     URL: <http://www.microsys.de/html/cu824.html>
-
-CONFIG_MAC_ADBKEYCODES
-  This provides support for sending ADB keycodes to console devices in
-  raw mode, rather than generic "Linux" keycodes.  This is the default
-  up to 2.4.0, but in future this may be phased out in favor of
-  generic Linux keycodes.  If you say Y here, you can dynamically
-  switch via the /proc/sys/dev/mac_hid/keyboard_sends_linux_keycodes
-  sysctl and with the "keyboard_sends_linux_keycodes=" kernel
-  argument.
-
-  If unsure, say Y here.
-
-CONFIG_MAC_EMUMOUSEBTN
-  This provides generic support for emulating the 2nd and 3rd mouse
-  button with keypresses.  If you say Y here, the emulation is still
-  disabled by default.  The emulation is controlled by these sysctl
-  entries:
-      /proc/sys/dev/mac_hid/mouse_button_emulation
-      /proc/sys/dev/mac_hid/mouse_button2_keycode
-      /proc/sys/dev/mac_hid/mouse_button3_keycode
-
-  If you have an Apple machine with a 1-button mouse, say Y here.
 
 CONFIG_PPC_RTC
   If you say Y here and create a character special file /dev/rtc with

Index: config.in
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/config.in,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- config.in	10 Jul 2002 18:08:02 -0000	1.35
+++ config.in	23 Jul 2002 19:18:48 -0000	1.36
@@ -378,7 +378,7 @@
    define_bool CONFIG_AMIGA y
    define_bool CONFIG_ZORRO y
    define_bool CONFIG_INPUT y
-   define_bool CONFIG_INPUT_MOUSE y		
+   define_bool CONFIG_INPUT_MOUSE y
    define_bool CONFIG_MOUSE_AMIGA y
    define_bool CONFIG_ABSTRACT_CONSOLE y
    define_bool CONFIG_FB y
@@ -526,12 +526,9 @@
    bool 'Apple Desktop Bus (ADB) support' CONFIG_ADB
    if [ "$CONFIG_ADB" = "y" ]; then
       bool '   Include MacIO (CHRP) ADB driver' CONFIG_ADB_MACIO
-      dep_bool '   Use input layer for ADB devices' CONFIG_INPUT_ADBHID $CONFIG_INPUT
+      dep_bool '   Support for ADB input devices (keyboard, mice, ...)' CONFIG_INPUT_ADBHID $CONFIG_INPUT
       if [ "$CONFIG_INPUT_ADBHID" = "y" ]; then
-         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
    # This is for drivers/macintosh/mac_hid.o, which is needed if the input