Merge with Linux 2.4.0-test2.

1 files changed, 154 insertions, 98 deletions

diff --git a/Documentation/Configure.help b/Documentation/Configure.help
index e13f5a71b..5e4f351e5 100644
--- a/Documentation/Configure.help
+++ b/Documentation/Configure.help
@@ -12811,143 +12811,183 @@ CONFIG_JOYSTICK
   weapon control system or something like that you can say Y here to
   enable generic support for these controllers. You will also need to
   say Y or M to at least one of the hardware specific drivers. This
-  will make the controllers available as /dev/jsX devices. Please read
-  the file Documentation/joystick.txt which contains more information
-  and the location of the joystick package that you'll need.
+  will make the controllers available as /dev/input/jsX devices.
+  Please read the file Documentation/joystick.txt which contains more
+  information and the location of the joystick package that you'll
+  need.
+
+ns558 gameports
+CONFIG_INPUT_NS558
+  Say Y here if you have an ISA, ISAPnP or PCI standard gameport.
+  For more information on how to use the driver please read
+  Documentation/joystick.txt
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
-  The module will be called joystick.o. If you want to compile it as a
-  module, say M here and read Documentation/modules.txt.
+  The module will be called ns558.o. If you want to compile
+  it as a module, say M here and read Documentation/modules.txt.
+
+PDPI Lightning 4 gamecard
+CONFIG_INPUT_LIGHTNING
+  Say Y here if you have a PDPI Lightning 4 gamecard. For more
+  information on how to use the driver please read
+  Documentation/joystick.txt
+
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called lightning.o. If you want to compile
+  it as a module, say M here and read Documentation/modules.txt.
 
-Classic PC analog
-CONFIG_JOY_ANALOG
+Aureal Vortex and Trident 4DWave gameports
+CONFIG_INPUT_PCIGAME
+  Say Y here if you have a Trident 4DWave DX/NX or Aureal Vortex 1/2
+  card. For more information on how to use the driver please read
+  Documentation/joystick.txt
+
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called pcigame.o. If you want to compile
+  it as a module, say M here and read Documentation/modules.txt.
+
+Classic PC analog joysticks and gamepads
+CONFIG_INPUT_ANALOG
   Say Y here if you have a controller that connects to the PC
   gameport. This supports many different types, including joysticks
   with throttle control, with rudders, or with extensions like
   additional hats and buttons compatible with CH Flightstick Pro,
-  ThrustMaster FCS or 6 and 8 button gamepads. For more information on
-  how to use the driver please read Documentation/joystick.txt
+  ThrustMaster FCS, 6 and 8 button gamepads, or Saitek Cyborg
+  joysticks. For more information on how to use the driver please read
+  Documentation/joystick.txt
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
-  The module will be called joy-analog.o. If you want to compile
+  The module will be called analog.o. If you want to compile
   it as a module, say M here and read Documentation/modules.txt.
 
-FPGaming and MadCatz A3D
-CONFIG_JOY_ASSASSIN
+Assasin 3D and MadCatz Panther devices
+CONFIG_INPUT_A3D
   Say Y here if you have an FPGaming or MadCatz controller using the
   A3D protocol over the PC gameport. For more information on how to
   use the driver please read Documentation/joystick.txt
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
-  The module will be called joy-assasin.o. If you want to compile
+  The module will be called a3d.o. If you want to compile
   it as a module, say M here and read Documentation/modules.txt.
 
-Gravis GrIP
-CONFIG_JOY_GRAVIS
-  Say Y here if you have a Gravis controller using the GrIP protocol
-  over the PC gameport. For more information on how to use the driver
-  please read Documentation/joystick.txt
+Logitech ADI digital joysticks and gamepads
+CONFIG_INPUT_ADI
+  Say Y here if you have a Logitech controller using the ADI
+  protocol over the PC gameport. For more information on how to use
+  the driver please read Documentation/joystick.txt
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
-  The module will be called joy-gravis.o. If you want to compile
+  The module will be called adi.o. If you want to compile
   it as a module, say M here and read Documentation/modules.txt.
 
-Logitech ADI
-CONFIG_JOY_LOGITECH
-  Say Y here if you have a Logitech controller using the ADI
-  protocol over the PC gameport. For more information on how to use
-  the driver please read Documentation/joystick.txt
+Creative Labs Blaster Cobra gamepad
+CONFIG_INPUT_COBRA
+  Say Y here if you have a Creative Labs Blaster Cobra gamepad.
+  For more information on how to use the driver please read
+  Documentation/joystick.txt
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
-  The module will be called joy-logitech.o. If you want to compile
+  The module will be called cobra.o. If you want to compile
   it as a module, say M here and read Documentation/modules.txt.
 
-Microsoft SideWinder
-CONFIG_JOY_SIDEWINDER
-  Say Y here if you have a Microsoft controller using the Digital
-  Overdrive protocol over PC gameport. For more information on how to
-  use the driver please read Documentation/joystick.txt
+Genius Flight2000 Digital joysticks and gamepads
+CONFIG_INPUT_GF2K
+  Say Y here if you have a Genius Flight2000 or MaxFighter
+  digitally communicating joystick or gamepad. For more information
+  on how to use the driver please read Documentation/joystick.txt
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
-  The module will be called joy-sidewinder.o. If you want to compile
+  The module will be called gf2k.o. If you want to compile
   it as a module, say M here and read Documentation/modules.txt.
 
-ThrustMaster DirectConnect
-CONFIG_JOY_THRUSTMASTER
-  Say Y here if you have a ThrustMaster controller using the
-  DirectConnect (BSP) protocol over the PC gameport. For more
-  information on how to use the driver please read
-  Documentation/joystick.txt
+Gravis GrIP joysticks and gamepads
+CONFIG_INPUT_GRIP
+  Say Y here if you have a Gravis controller using the GrIP protocol
+  over the PC gameport. For more information on how to use the driver
+  please read Documentation/joystick.txt
+
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called grip.o. If you want to compile
+  it as a module, say M here and read Documentation/modules.txt.
+
+InterAct digital joysticks and gamepads
+CONFIG_INPUT_INTERACT
+  Say Y hereif you have an InterAct gameport or joystick
+  communicating digitally over the gameport. For more information on
+  how to use the driver please read Documentation/joystick.txt
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
-  The module will be called joy-thrustmaster.o. If you want to compile
+  The module will be called interact.o. If you want to compile
   it as a module, say M here and read Documentation/modules.txt.
 
-Creative Labs Blaster
-CONFIG_JOY_CREATIVE
-  Say Y here if you have a Creative Labs controller using the
-  Blaster protocol over the PC gameport. For more information on how
-  to use the driver please read Documentation/joystick.txt
+ThrustMaster DirectConnect joysticks and gamepads
+CONFIG_INPUT_TMDC
+  Say Y here if you have a ThrustMaster controller using the
+  DirectConnect (BSP) protocol over the PC gameport. For more
+  information on how to use the driver please read
+  Documentation/joystick.txt
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
-  The module will be called joy-creative.o. If you want to compile
+  The module will be called tmdc.o. If you want to compile
   it as a module, say M here and read Documentation/modules.txt.
 
-PDPI Lightning 4 cards
-CONFIG_JOY_LIGHTNING
-  Say Y here if you have a PDPI Lightning 4 gamecard and an analog
-  joystick or gamepad connected to it. For more information on how to
+Microsoft SideWinder digital joysticks and gamepads
+CONFIG_INPUT_SIDEWINDER
+  Say Y here if you have a Microsoft controller using the Digital
+  Overdrive protocol over PC gameport. For more information on how to
   use the driver please read Documentation/joystick.txt
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
-  The module will be called joy-lightning.o. If you want to compile
+  The module will be called sidewinder.o. If you want to compile
   it as a module, say M here and read Documentation/modules.txt.
 
-Logitech WingMan Warrior
-CONFIG_JOY_WARRIOR
-  Say Y here if you have a Logitech WingMan Warrior controller
-  connected to your computer's serial port.  For more information on
-  how to use the driver please read Documentation/joystick.txt
+Serial port input line discipline
+CONFIG_INPUT_SERPORT
+  Say Y hereif you plan to use a joystick that communicates over the
+  serial (COM) port. For more information on how to use the driver
+  please read Documentation/joystick.txt
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
-  The module will be called joy-warrior.o. If you want to compile
+  The module will be called serport.o. If you want to compile
   it as a module, say M here and read Documentation/modules.txt.
 
-Trident 4DWave and Aureal Vortex gameport
-CONFIG_JOY_PCI
-  Say Y here if you have a Trident 4DWave DX/NX or Aureal Vortex 1/2
-  card and want to use its gameport in its enhanced digital mode
-  with and ordinary analog joystick. For more information on how to
-  use the driver please read Documentation/joystick.txt
+Logitech WingMan Warrior joystick
+CONFIG_INPUT_WARRIOR
+  Say Y here if you have a Logitech WingMan Warrior joystick
+  connected to your computer's serial port. For more information on
+  how to use the driver please read Documentation/joystick.txt
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
-  The module will be called joy-pci.o. If you want to compile
+  The module will be called warrior.o. If you want to compile
   it as a module, say M here and read Documentation/modules.txt.
 
-Magellan and Space Mouse
-CONFIG_JOY_MAGELLAN
+LogiCad3d Magellan/SpaceMouse 6dof controller
+CONFIG_INPUT_MAGELLAN
   Say Y here if you have a Magellan or Space Mouse 6DOF controller
   connected to your computer's serial port.  For more information on
   how to use the driver please read Documentation/joystick.txt
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
-  The module will be called joy-magellan.o. If you want to compile
+  The module will be called magellan.o. If you want to compile
   it as a module, say M here and read Documentation/modules.txt.
 
-SpaceTec SpaceOrb 360 and SpaceBall Avenger
-CONFIG_JOY_SPACEORB
+SpaceTec SpaceOrb/Avenger 6dof controller
+CONFIG_INPUT_SPACEORB
   Say Y here if you have a SpaceOrb 360 or SpaceBall Avenger 6DOF
   controller connected to your computer's serial port.  For more
   information on how to use the driver please read
@@ -12955,37 +12995,39 @@ CONFIG_JOY_SPACEORB
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
-  The module will be called joy-spaceorb.o. If you want to compile
+  The module will be called spaceorb.o. If you want to compile
   it as a module, say M here and read Documentation/modules.txt.
  
-SpaceTec SpaceBall 4000 FLX
-CONFIG_JOY_SPACEBALL
-  Say Y here if you have a SpaceTec SpaceBall 4000 FLX
-  controller connected to your computer's serial port.  For more
-  information on how to use the driver please read
-  Documentation/joystick.txt
+SpaceTec SpaceBall 4000 FLX 6dof controller
+CONFIG_INPUT_SPACEBALL
+  Say Y here if you have a SpaceTec SpaceBall 4000 FLX controller
+  connected to your computer's serial port. For more information on
+  how to use the driver please read Documentation/joystick.txt
+
+I-Force joysticks/wheels
+CONFIG_INPUT_IFORCE_232
+  Say Y here if you have an I-Force joystick or steering wheel
+  connected to your serial (COM) port. For more information on
+  how to use the driver please read Documentation/joystick.txt
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
-  The module will be called joy-spaceball.o. If you want to compile
+  The module will be called iforce.o. If you want to compile
   it as a module, say M here and read Documentation/modules.txt.
- 
-NES, SNES, N64, PSX, Multi
-CONFIG_JOY_CONSOLE
-  Say Y here if you have a Nintendo Entertainment System gamepad,
-  Super Nintendo Entertainment System gamepad, Nintendo 64 gamepad,
-  Sony PlayStation gamepad or a Multisystem -- Atari, Amiga,
-  Commodore, Amstrad CPC joystick connected to your parallel port.
-  For more information on how to use the driver please read
-  Documentation/joystick.txt and Documentation/joystick-parport.txt
+
+I-Force joysticks/wheels
+CONFIG_INPUT_IFORCE_USB
+  Say Y here if you have an I-Force joystick or steering wheel
+  connected to your USB port. For more information on how to use the
+  driver please read Documentation/joystick.txt
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
-  The module will be called joy-console.o. If you want to compile
+  The module will be called iforce.o. If you want to compile
   it as a module, say M here and read Documentation/modules.txt.
-
-Sega, Multi
-CONFIG_JOY_DB9
+ 
+Multisystem, Sega Genesis, Saturn joysticks and gamepads
+CONFIG_INPUT_DB9
   Say Y here if you have a Sega Master System gamepad, Sega Genesis
   gamepad, Sega Saturn gamepad, or a Multisystem -- Atari, Amiga,
   Commodore, Amstrad CPC joystick connected to your parallel port. 
@@ -12994,24 +13036,38 @@ CONFIG_JOY_DB9
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
-  The module will be called joy-db9.o. If you want to compile
+  The module will be called db9.o. If you want to compile
+  it as a module, say M here and read Documentation/modules.txt.
+
+Multisystem, NES, SNES, N64, PSX joysticks and gamepads
+CONFIG_INPUT_GAMECON
+  Say Y here if you have a Nintendo Entertainment System gamepad,
+  Super Nintendo Entertainment System gamepad, Nintendo 64 gamepad,
+  Sony PlayStation gamepad or a Multisystem -- Atari, Amiga,
+  Commodore, Amstrad CPC joystick connected to your parallel port.
+  For more information on how to use the driver please read
+  Documentation/joystick.txt and Documentation/joystick-parport.txt
+
+  This driver is also available as a module ( = code which can be
+  inserted in and removed from the running kernel whenever you want).
+  The module will be called gamecon.o. If you want to compile
   it as a module, say M here and read Documentation/modules.txt.
 
-TurboGraFX Multisystem interface
-CONFIG_JOY_TURBOGRAFX
-  Say Y here if you have the TurboGraFX interface by Steffen Schwenke,
-  and want to use it with Multiststem -- Atari, Amiga, Commodore,
-  Amstrad CPC joystick. For more information on how to use the driver
-  please read Documentation/joystick.txt and
+Multisystem joysticks via TurboGraFX device
+CONFIG_INPUT_TURBOGRAFX
+  Say Y here if you have the TurboGraFX interface by Steffen
+  Schwenke, and want to use it with Multiststem -- Atari, Amiga,
+  Commodore, Amstrad CPC joystick. For more information on how to use
+  the driver please read Documentation/joystick.txt and
   Documentation/joystick-parport.txt
 
   This driver is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
-  The module will be called joy-turbografx.o. If you want to compile
+  The module will be called turbografx.o. If you want to compile
   it as a module, say M here and read Documentation/modules.txt.
 
 Amiga joysticks
-CONFIG_JOY_AMIGA
+CONFIG_INPUT_AMIJOY
   Say Y here if you have an Amiga with a digital joystick connected
   to it. For more information on how to use the driver please read
   Documentation/joystick.txt
@@ -14244,7 +14300,7 @@ CONFIG_OBP_FLASH
   The OpenBoot PROM on Ultra systems is flashable. If you want to be
   able to upgrade the OBP firmware, say Y here.
 
-JavaStation OS Flash SIMM (EXPERIMENTAL)
+JavaStation OS Flash SIMM
 CONFIG_SUN_JSFLASH
   If you say Y here, you will be able to boot from your JavaStation's
   Flash memory.