Menu
▾
▴
[linuxsh-dev] 2.5.8-pre1
|
From: NIIBE Y. <gn...@m1...> - 2002-04-05 04:44:42
|
Fix divergence. When joystick driver has been moved, we didn't update the files. Now done. 2002-04-05 NIIBE Yutaka <gn...@m1...> * drivers/input/joystick/Config.in: Updated to 2.5.8-pre1. * drivers/input/joystick/Config.help: Ditto. * drivers/input/joystick/Makefile: Ditto. * drivers/net/Config.in: Ditto. * arch/sh/kernel/pci-sh7751.c: Martin's e-mail change to ucw.cz. (follow the change of arch/i386/*.) * drivers/video/epson1355fb.c (e1355fb_init): Use NODEV Instead of -1. Index: arch/sh/kernel/pci-sh7751.c =================================================================== RCS file: /cvsroot/linuxsh/linux/arch/sh/kernel/pci-sh7751.c,v retrieving revision 1.1 diff -u -3 -p -r1.1 pci-sh7751.c --- arch/sh/kernel/pci-sh7751.c 15 Oct 2001 20:44:49 -0000 1.1 +++ arch/sh/kernel/pci-sh7751.c 5 Apr 2002 04:41:02 -0000 @@ -3,7 +3,7 @@ * * Dustin McIntire (du...@se...) * Derived from arch/i386/kernel/pci-*.c which bore the message: - * (c) 1999--2000 Martin Mares <mj...@su...> + * (c) 1999--2000 Martin Mares <mj...@uc...> * * May be copied or modified under the terms of the GNU General Public * License. See linux/COPYING for more information. Index: drivers/input/joystick/Config.help =================================================================== RCS file: /cvsroot/linuxsh/linux/drivers/input/joystick/Config.help,v retrieving revision 1.1 diff -u -3 -p -r1.1 Config.help --- drivers/input/joystick/Config.help 19 Mar 2002 23:50:07 -0000 1.1 +++ drivers/input/joystick/Config.help 5 Apr 2002 04:41:02 -0000 @@ -1,274 +1,181 @@ -CONFIG_INPUT_GAMEPORT - Gameport support is for the standard 15-pin PC gameport. If you - have a joystick, gamepad, gameport card, a soundcard with a gameport - or anything else that uses the gameport, say Y or M here and also to - at least one of the hardware specific drivers. - Please read the file <file:Documentation/input/joystick.txt> which - contains more information and the location of the joystick package - that you'll need if you use the gameport with a joystick. - - 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 gameport.o. If you want to compile it as - a module, say M here and read <file:Documentation/modules.txt>. - -CONFIG_INPUT_NS558 - Say Y here if you have an ISA or PnP gameport. - For more information on how to use the driver please read - <file:Documentation/input/joystick.txt>. +CONFIG_JOYSTICK + If you have a joystick, 6dof controller, gamepad, steering wheel, + weapon control system or something like that you can say Y here + and the list of supported devices will be displayed. This option + doesn't affect the kernel. - 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 ns558.o. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. - -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 - <file:Documentation/input/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 <file:Documentation/modules.txt>. - -CONFIG_INPUT_CS461X - Say Y here if you have a Cirrus CS461x aka "Crystal SoundFusion" - PCI audio accelerator. A product page for the CS4614 is at - <http://www.cirrus.com/design/products/overview/index.cfm?ProductID=40>. - - 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 cs461x.o. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. - -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 - <file:Documentation/input/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 <file:Documentation/modules.txt>. + Please read the file <file:Documentation/input/joystick.txt> which + contains more information. -CONFIG_INPUT_EMU10K1 - Say Y here if you have a SoundBlaster Live! card and want to use - its gameport. For more information on how to use the driver - please read <file:Documentation/input/joystick.txt>. +CONFIG_JOYSTICK_ANALOG + Say Y here if you have a joystick that connects to the PC + gameport. In addition to the usual PC analog joystick, this driver + supports many extensions, including joysticks with throttle control, + with rudders, additional hats and buttons compatible with CH + Flightstick Pro, ThrustMaster FCS, 6 and 8 button gamepads, or + Saitek Cyborg joysticks. - 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 emu10k1-gp.o. If you want to compile it as - a module, say M here and read <file:Documentation/modules.txt>. - -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, 6 and 8 button gamepads, or Saitek Cyborg - joysticks. For more information on how to use the driver please - read <file:Documentation/input/joystick.txt>. + Please read the file <file:Documentation/input/joystick.txt> which + contains more information. 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 analog.o. If you want to compile it as a + The module will be called analog.o. If you want to compile it as a module, say M here and read <file:Documentation/modules.txt>. -CONFIG_INPUT_A3D +CONFIG_JOYSTICK_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 <file:Documentation/input/joystick.txt>. + A3D protocol over the PC gameport. 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 a3d.o. If you want to compile it as a + The module will be called a3d.o. If you want to compile it as a module, say M here and read <file:Documentation/modules.txt>. -CONFIG_INPUT_ADI +CONFIG_JOYSTICK_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 <file:Documentation/input/joystick.txt>. + protocol over the PC gameport. 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 adi.o. If you want to compile it as a + The module will be called adi.o. If you want to compile it as a module, say M here and read <file:Documentation/modules.txt>. -CONFIG_INPUT_COBRA +CONFIG_JOYSTICK_COBRA Say Y here if you have a Creative Labs Blaster Cobra gamepad. - For more information on how to use the driver please read - <file:Documentation/input/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 cobra.o. If you want to compile it as a + The module will be called cobra.o. If you want to compile it as a module, say M here and read <file:Documentation/modules.txt>. -CONFIG_INPUT_GF2K +CONFIG_JOYSTICK_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 <file:Documentation/input/joystick.txt>. + communicating joystick or gamepad. 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 gf2k.o. If you want to compile it as a + The module will be called gf2k.o. If you want to compile it as a module, say M here and read <file:Documentation/modules.txt>. -CONFIG_INPUT_GRIP +CONFIG_JOYSTICK_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 <file:Documentation/input/joystick.txt>. + over the PC gameport. 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 + The module will be called grip.o. If you want to compile it as a module, say M here and read <file:Documentation/modules.txt>. -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 <file:Documentation/input/joystick.txt>. +CONFIG_JOYSTICK_INTERACT + Say Y here if you have an InterAct gameport or joystick + communicating digitally over the gameport. 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 interact.o. If you want to compile it as + The module will be called interact.o. If you want to compile it as a module, say M here and read <file:Documentation/modules.txt>. -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 - <file:Documentation/input/joystick.txt>. +CONFIG_JOYSTICK_SIDEWINDER + Say Y here if you have a Microsoft controller using the Digital + Overdrive protocol over PC gameport. 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 tmdc.o. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. + The module will be called sidewinder.o. If you want to compile it + as a module, say M here and read <file:Documentation/modules.txt>. -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 <file:Documentation/input/joystick.txt>. +CONFIG_JOYSTICK_TMDC + Say Y here if you have a ThrustMaster controller using the + DirectConnect (BSP) protocol over the PC gameport. 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 sidewinder.o. If you want to compile it - as a module, say M here and read <file:Documentation/modules.txt>. + The module will be called tmdc.o. If you want to compile it as a + module, say M here and read <file:Documentation/modules.txt>. -CONFIG_INPUT_SERIO - Say Y here and to the Serial port input line discipline option if - you plan to use a joystick that communicates over the serial (COM) - port. For more information on how to use the driver please read - <file:Documentation/input/joystick.txt>. +CONFIG_JOYSTICK_IFORCE_USB + Say Y here if you have an I-Force joystick or steering wheel + connected to your USB port. 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 sidewinder.o. If you want to compile it - as a module, say M here and read <file:Documentation/modules.txt>. + The module will be called iforce.o. If you want to compile it as a + module, say M here and read <file:Documentation/modules.txt>. -CONFIG_INPUT_SERPORT - Say Y here if you plan to use a joystick that communicates over the - serial (COM) port. For more information on how to use the driver - please read <file:Documentation/input/joystick.txt>. +CONFIG_JOYSTICK_IFORCE_232 + Say Y here if you have an I-Force joystick or steering wheel + connected to your serial (COM) port. 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 serport.o. If you want to compile it as a + The module will be called iforce.o. If you want to compile it as a module, say M here and read <file:Documentation/modules.txt>. -CONFIG_INPUT_WARRIOR +CONFIG_JOYSTICK_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 <file:Documentation/input/joystick.txt>. + to your computer's serial port. 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 warrior.o. If you want to compile it as a + The module will be called warrior.o. If you want to compile it as a module, say M here and read <file:Documentation/modules.txt>. -CONFIG_INPUT_MAGELLAN +CONFIG_JOYSTICK_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 <file:Documentation/input/joystick.txt>. + connected to your computer's serial port. 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 magellan.o. If you want to compile it as + The module will be called magellan.o. If you want to compile it as a module, say M here and read <file:Documentation/modules.txt>. -CONFIG_INPUT_SPACEORB +CONFIG_JOYSTICK_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 - <file:Documentation/input/joystick.txt>. + controller connected to your computer's serial port. 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 spaceorb.o. If you want to compile it as + The module will be called spaceorb.o. If you want to compile it as a module, say M here and read <file:Documentation/modules.txt>. -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 <file:Documentation/input/joystick.txt>. +CONFIG_JOYSTICK_SPACEBALL + Say Y here if you have a SpaceTec SpaceBall 2003/3003/4000 FLX + controller connected to your computer's serial port. For the + SpaceBall 4000 USB model, use the USB HID driver. 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 spaceball.o. If you want to compile it as + The module will be called spaceball.o. If you want to compile it as a module, say M here and read <file:Documentation/modules.txt>. -CONFIG_INPUT_STINGER +CONFIG_JOYSTICK_STINGER Say Y here if you have a Gravis Stinger connected to one of your - serial ports. For more information on how to use the driver please - read <file:Documentation/input/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 stinger.o. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. - -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 <file:Documentation/input/joystick.txt>. + serial ports. 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 iforce.o. If you want to compile it as a + The module will be called stinger.o. If you want to compile it as a module, say M here and read <file:Documentation/modules.txt>. -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 <file:Documentation/input/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 iforce.o. If you want to compile it as a - module, say M here and read <file:Documentation/modules.txt>. - -CONFIG_INPUT_DB9 +CONFIG_JOYSTICK_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. For more information on how to use the driver please read - <file:Documentation/input/joystick.txt> and <file:Documentation/input/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 db9.o. If you want to compile it as a + The module will be called db9.o. If you want to compile it as a module, say M here and read <file:Documentation/modules.txt>. -CONFIG_INPUT_GAMECON +CONFIG_JOYSTICK_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 - <file:Documentation/input/joystick.txt> and <file:Documentation/input/joystick-parport.txt>. This driver is also available as a module ( = code which can be @@ -276,25 +183,23 @@ CONFIG_INPUT_GAMECON The module will be called gamecon.o. If you want to compile it as a module, say M here and read <file:Documentation/modules.txt>. -CONFIG_INPUT_TURBOGRAFX +CONFIG_JOYSTICK_TURBOGRAFX Say Y here if you have the TurboGraFX interface by Steffen Schwenke, and want to use it with Multisystem -- Atari, Amiga, Commodore, - Amstrad CPC joystick. For more information on how to use the driver - please read <file:Documentation/input/joystick.txt> and - <file:Documentation/input/joystick-parport.txt>. + Amstrad CPC joystick. For more information on how to use the driver + please read <file:Documentation/input/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 turbografx.o. If you want to compile it + The module will be called turbografx.o. If you want to compile it as a module, say M here and read <file:Documentation/modules.txt>. -CONFIG_INPUT_AMIJOY +CONFIG_JOYSTICK_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 - <file:Documentation/input/joystick.txt>. + to it. 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-amiga.o. If you want to compile it as + The module will be called joy-amiga.o. If you want to compile it as a module, say M here and read <file:Documentation/modules.txt>. Index: drivers/input/joystick/Config.in =================================================================== RCS file: /cvsroot/linuxsh/linux/drivers/input/joystick/Config.in,v retrieving revision 1.1 diff -u -3 -p -r1.1 Config.in --- drivers/input/joystick/Config.in 19 Mar 2002 23:50:07 -0000 1.1 +++ drivers/input/joystick/Config.in 5 Apr 2002 04:41:02 -0000 @@ -2,57 +2,34 @@ # Joystick driver configuration # -mainmenu_option next_comment -comment 'Joysticks' +bool 'Joysticks' CONFIG_INPUT_JOYSTICK -if [ "$CONFIG_INPUT" != "n" ]; then - dep_tristate 'Game port support' CONFIG_INPUT_GAMEPORT $CONFIG_INPUT - dep_tristate ' Classic ISA/PnP gameports' CONFIG_INPUT_NS558 $CONFIG_INPUT_GAMEPORT - dep_tristate ' PDPI Lightning 4 gamecard' CONFIG_INPUT_LIGHTNING $CONFIG_INPUT_GAMEPORT - dep_tristate ' Aureal Vortex and Trident 4DWave gameports' CONFIG_INPUT_PCIGAME $CONFIG_INPUT_GAMEPORT - dep_tristate ' Crystal SoundFusion gameports' CONFIG_INPUT_CS461X $CONFIG_INPUT_GAMEPORT - dep_tristate ' SoundBlaster Live! gameports' CONFIG_INPUT_EMU10K1 $CONFIG_INPUT_GAMEPORT - tristate 'Serial port device support' CONFIG_INPUT_SERIO - dep_tristate ' Serial port input line discipline' CONFIG_INPUT_SERPORT $CONFIG_INPUT_SERIO -else - # Must explicitly set to n for drivers/sound/Config.in - define_tristate CONFIG_INPUT_GAMEPORT n - comment 'Input core support is needed for gameports' -fi - -if [ "$CONFIG_INPUT" != "n" ]; then - comment 'Joysticks' - - dep_tristate ' Classic PC analog joysticks and gamepads' CONFIG_INPUT_ANALOG $CONFIG_INPUT $CONFIG_INPUT_GAMEPORT - dep_tristate ' Assasin 3D and MadCatz Panther devices' CONFIG_INPUT_A3D $CONFIG_INPUT $CONFIG_INPUT_GAMEPORT - dep_tristate ' Logitech ADI digital joysticks and gamepads' CONFIG_INPUT_ADI $CONFIG_INPUT $CONFIG_INPUT_GAMEPORT - dep_tristate ' Creative Labs Blaster Cobra gamepad' CONFIG_INPUT_COBRA $CONFIG_INPUT $CONFIG_INPUT_GAMEPORT - dep_tristate ' Genius Flight2000 Digital joysticks and gamepads' CONFIG_INPUT_GF2K $CONFIG_INPUT $CONFIG_INPUT_GAMEPORT - dep_tristate ' Gravis GrIP joysticks and gamepads' CONFIG_INPUT_GRIP $CONFIG_INPUT $CONFIG_INPUT_GAMEPORT - dep_tristate ' InterAct digital joysticks and gamepads' CONFIG_INPUT_INTERACT $CONFIG_INPUT $CONFIG_INPUT_GAMEPORT - dep_tristate ' ThrustMaster DirectConnect joysticks and gamepads' CONFIG_INPUT_TMDC $CONFIG_INPUT $CONFIG_INPUT_GAMEPORT - dep_tristate ' Microsoft SideWinder digital joysticks and gamepads' CONFIG_INPUT_SIDEWINDER $CONFIG_INPUT $CONFIG_INPUT_GAMEPORT - dep_tristate ' I-Force USB joysticks and wheels' CONFIG_INPUT_IFORCE_USB $CONFIG_INPUT $CONFIG_USB - dep_tristate ' I-Force Serial joysticks and wheels' CONFIG_INPUT_IFORCE_232 $CONFIG_INPUT $CONFIG_INPUT_SERIO - dep_tristate ' Logitech WingMan Warrior joystick' CONFIG_INPUT_WARRIOR $CONFIG_INPUT $CONFIG_INPUT_SERIO - dep_tristate ' LogiCad3d Magellan/SpaceMouse 6dof controller' CONFIG_INPUT_MAGELLAN $CONFIG_INPUT $CONFIG_INPUT_SERIO - dep_tristate ' SpaceTec SpaceOrb/Avenger 6dof controller' CONFIG_INPUT_SPACEORB $CONFIG_INPUT $CONFIG_INPUT_SERIO - dep_tristate ' SpaceTec SpaceBall 4000 FLX 6dof controller' CONFIG_INPUT_SPACEBALL $CONFIG_INPUT $CONFIG_INPUT_SERIO - dep_tristate ' Gravis Stinger gamepad' CONFIG_INPUT_STINGER $CONFIG_INPUT $CONFIG_INPUT_SERIO - dep_tristate ' Multisystem, Sega Genesis, Saturn joysticks and gamepads' CONFIG_INPUT_DB9 $CONFIG_INPUT $CONFIG_PARPORT - dep_tristate ' Multisystem, NES, SNES, N64, PSX joysticks and gamepads' CONFIG_INPUT_GAMECON $CONFIG_INPUT $CONFIG_PARPORT - dep_tristate ' Multisystem joysticks via TurboGraFX device' CONFIG_INPUT_TURBOGRAFX $CONFIG_INPUT $CONFIG_PARPORT +dep_tristate ' Classic PC analog joysticks and gamepads' CONFIG_JOYSTICK_ANALOG $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK $CONFIG_GAMEPORT +dep_tristate ' Assasin 3D and MadCatz Panther devices' CONFIG_JOYSTICK_A3D $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK $CONFIG_GAMEPORT +dep_tristate ' Logitech ADI digital joysticks and gamepads' CONFIG_JOYSTICK_ADI $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK $CONFIG_GAMEPORT +dep_tristate ' Creative Labs Blaster Cobra gamepad' CONFIG_JOYSTICK_COBRA $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK $CONFIG_GAMEPORT +dep_tristate ' Genius Flight2000 Digital joysticks and gamepads' CONFIG_JOYSTICK_GF2K $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK $CONFIG_GAMEPORT +dep_tristate ' Gravis GrIP joysticks and gamepads' CONFIG_JOYSTICK_GRIP $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK $CONFIG_GAMEPORT +dep_tristate ' InterAct digital joysticks and gamepads' CONFIG_JOYSTICK_INTERACT $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK $CONFIG_GAMEPORT +dep_tristate ' Microsoft SideWinder digital joysticks and gamepads' CONFIG_JOYSTICK_SIDEWINDER $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK $CONFIG_GAMEPORT +dep_tristate ' ThrustMaster DirectConnect joysticks and gamepads' CONFIG_JOYSTICK_TMDC $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK $CONFIG_GAMEPORT + +dep_tristate ' I-Force USB joysticks and wheels' CONFIG_JOYSTICK_IFORCE_USB $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK $CONFIG_USB +dep_tristate ' I-Force Serial joysticks and wheels' CONFIG_JOYSTICK_IFORCE_232 $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK $CONFIG_SERIO +dep_tristate ' Logitech WingMan Warrior joystick' CONFIG_JOYSTICK_WARRIOR $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK $CONFIG_SERIO +dep_tristate ' LogiCad3d Magellan/SpaceMouse 6dof controllers' CONFIG_JOYSTICK_MAGELLAN $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK $CONFIG_SERIO +dep_tristate ' SpaceTec SpaceOrb/Avenger 6dof controllers' CONFIG_JOYSTICK_SPACEORB $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK $CONFIG_SERIO +dep_tristate ' SpaceTec SpaceBall 6dof controllers' CONFIG_JOYSTICK_SPACEBALL $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK $CONFIG_SERIO +dep_tristate ' Gravis Stinger gamepad' CONFIG_JOYSTICK_STINGER $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK $CONFIG_SERIO + +dep_tristate ' Multisystem, Sega Genesis, Saturn joysticks and gamepads' CONFIG_JOYSTICK_DB9 $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK $CONFIG_PARPORT +dep_tristate ' Multisystem, NES, SNES, N64, PSX joysticks and gamepads' CONFIG_JOYSTICK_GAMECON $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK $CONFIG_PARPORT +dep_tristate ' Multisystem joysticks via TurboGraFX device' CONFIG_JOYSTICK_TURBOGRAFX $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK $CONFIG_PARPORT - if [ "$CONFIG_AMIGA" = "y" ]; then - dep_tristate ' Amiga joysticks' CONFIG_INPUT_AMIJOY $CONFIG_INPUT - fi - - if [ "$CONFIG_MAPLE" != "n" ]; then - comment 'Dreamcast Maple Bus controllers' - dep_tristate ' Maple Bus controllers' CONFIG_INPUT_MAPLE_CONTROL $CONFIG_INPUT - fi -else - comment 'Input core support is needed for joysticks' +if [ "$CONFIG_AMIGA" = "y" ]; then + dep_tristate ' Amiga joysticks' CONFIG_JOYSTICK_AMIJOY $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK fi -endmenu +if [ "$CONFIG_MAPLE" != "n" ]; then + dep_tristate ' Dreamcast Maple Bus controllers' CONFIG_JOYSTICK_MAPLE_CONTROL $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK +fi Index: drivers/input/joystick/Makefile =================================================================== RCS file: /cvsroot/linuxsh/linux/drivers/input/joystick/Makefile,v retrieving revision 1.1 diff -u -3 -p -r1.1 Makefile --- drivers/input/joystick/Makefile 19 Mar 2002 23:50:07 -0000 1.1 +++ drivers/input/joystick/Makefile 5 Apr 2002 04:41:02 -0000 @@ -1,71 +1,51 @@ # -# Makefile for the joystick drivers. +# Makefile for the input core drivers. # -O_TARGET := js.o +# The target object and module list name. -# Objects that export symbols. - -export-objs := serio.o gameport.o +O_TARGET := joydrv.o # I-Force may need both USB and RS-232 -ifeq ($(CONFIG_INPUT_IFORCE_232),m) - ifeq ($(CONFIG_INPUT_IFORCE_USB),y) - CONFIG_INPUT_IFORCE_USB := m - endif -endif -ifeq ($(CONFIG_INPUT_IFORCE_USB),m) - ifeq ($(CONFIG_INPUT_IFORCE_232),y) - CONFIG_INPUT_IFORCE_232 := m +CONFIG_JOYSTICK_IFORCE := n + +ifeq ($(CONFIG_JOYSTICK_IFORCE_232),y) + ifeq ($(CONFIG_JOYSTICK_IFORCE_USB),y) + CONFIG_JOYSTICK_IFORCE := y endif endif -# Object file lists. +ifeq ($(CONFIG_JOYSTICK_IFORCE_232),m) + CONFIG_JOYSTICK_IFORCE := m +endif -obj-y := -obj-m := -obj-n := -obj- := +ifeq ($(CONFIG_JOYSTICK_IFORCE_USB),m) + CONFIG_JOYSTICK_IFORCE := m +endif # Each configuration option enables a list of files. -obj-$(CONFIG_INPUT_GAMEPORT) += gameport.o -obj-$(CONFIG_INPUT_SERIO) += serio.o - -obj-$(CONFIG_INPUT_SERPORT) += serport.o - -obj-$(CONFIG_INPUT_NS558) += ns558.o -obj-$(CONFIG_INPUT_LIGHTNING) += lightning.o -obj-$(CONFIG_INPUT_PCIGAME) += pcigame.o -obj-$(CONFIG_INPUT_CS461X) += cs461x.o -obj-$(CONFIG_INPUT_EMU10K1) += emu10k1-gp.o - -obj-$(CONFIG_INPUT_WARRIOR) += warrior.o -obj-$(CONFIG_INPUT_MAGELLAN) += magellan.o -obj-$(CONFIG_INPUT_SPACEORB) += spaceorb.o -obj-$(CONFIG_INPUT_SPACEBALL) += spaceball.o -obj-$(CONFIG_INPUT_STINGER) += stinger.o -obj-$(CONFIG_INPUT_IFORCE_232) += iforce.o -obj-$(CONFIG_INPUT_IFORCE_USB) += iforce.o - -obj-$(CONFIG_INPUT_ANALOG) += analog.o -obj-$(CONFIG_INPUT_A3D) += a3d.o -obj-$(CONFIG_INPUT_ADI) += adi.o -obj-$(CONFIG_INPUT_COBRA) += cobra.o -obj-$(CONFIG_INPUT_GF2K) += gf2k.o -obj-$(CONFIG_INPUT_GRIP) += grip.o -obj-$(CONFIG_INPUT_INTERACT) += interact.o -obj-$(CONFIG_INPUT_TMDC) += tmdc.o -obj-$(CONFIG_INPUT_SIDEWINDER) += sidewinder.o - -obj-$(CONFIG_INPUT_DB9) += db9.o -obj-$(CONFIG_INPUT_GAMECON) += gamecon.o -obj-$(CONFIG_INPUT_TURBOGRAFX) += turbografx.o - -obj-$(CONFIG_INPUT_AMIJOY) += amijoy.o - -obj-$(CONFIG_INPUT_MAPLE_CONTROL)+= maplecontrol.o +obj-$(CONFIG_JOYSTICK_A3D) += a3d.o +obj-$(CONFIG_JOYSTICK_ADI) += adi.o +obj-$(CONFIG_JOYSTICK_AMIGA) += amijoy.o +obj-$(CONFIG_JOYSTICK_ANALOG) += analog.o +obj-$(CONFIG_JOYSTICK_COBRA) += cobra.o +obj-$(CONFIG_JOYSTICK_DB9) += db9.o +obj-$(CONFIG_JOYSTICK_GAMECON) += gamecon.o +obj-$(CONFIG_JOYSTICK_GF2K) += gf2k.o +obj-$(CONFIG_JOYSTICK_GRIP) += grip.o +obj-$(CONFIG_JOYSTICK_IFORCE) += iforce.o +obj-$(CONFIG_JOYSTICK_INTERACT) += interact.o +obj-$(CONFIG_JOYSTICK_MAGELLAN) += magellan.o +obj-$(CONFIG_JOYSTICK_MAPLE_CONTROL) += maplecontrol.o +obj-$(CONFIG_JOYSTICK_SIDEWINDER) += sidewinder.o +obj-$(CONFIG_JOYSTICK_SPACEBALL) += spaceball.o +obj-$(CONFIG_JOYSTICK_SPACEORB) += spaceorb.o +obj-$(CONFIG_JOYSTICK_STINGER) += stinger.o +obj-$(CONFIG_JOYSTICK_TMDC) += tmdc.o +obj-$(CONFIG_JOYSTICK_TURBOGRAFX) += turbografx.o +obj-$(CONFIG_JOYSTICK_WARRIOR) += warrior.o # The global Rules.make. Index: drivers/net/8139too.c =================================================================== RCS file: /cvsroot/linuxsh/linux/drivers/net/8139too.c,v retrieving revision 1.10 diff -u -3 -p -r1.10 8139too.c --- drivers/net/8139too.c 28 Mar 2002 04:27:05 -0000 1.10 +++ drivers/net/8139too.c 5 Apr 2002 04:41:02 -0000 @@ -108,9 +108,8 @@ #include <linux/delay.h> #include <linux/ethtool.h> #include <linux/mii.h> -#include <linux/crc32.h> #include <linux/completion.h> - +#include <linux/crc32.h> #include <asm/io.h> #include <asm/uaccess.h> @@ -2243,10 +2242,11 @@ static int netdev_ethtool_ioctl (struct /* dev_ioctl() in ../../net/core/dev.c has already checked capable(CAP_NET_ADMIN), so don't bother with that here. */ - if (get_user (ethcmd, (u32 *)useraddr)) + if (get_user(ethcmd, (u32 *)useraddr)) return -EFAULT; switch (ethcmd) { + case ETHTOOL_GDRVINFO: { struct ethtool_drvinfo info = { ETHTOOL_GDRVINFO }; strcpy (info.driver, DRV_NAME); Index: drivers/net/Config.in =================================================================== RCS file: /cvsroot/linuxsh/linux/drivers/net/Config.in,v retrieving revision 1.7 diff -u -3 -p -r1.7 Config.in --- drivers/net/Config.in 4 Apr 2002 09:03:55 -0000 1.7 +++ drivers/net/Config.in 5 Apr 2002 04:41:02 -0000 @@ -69,12 +69,12 @@ if [ "$CONFIG_NET_ETHERNET" = "y" ]; the if [ "$CONFIG_SUPERH" = "y" ]; then tristate ' National DP83902AV support' CONFIG_STNIC fi + dep_tristate ' Sun LANCE support' CONFIG_SUNLANCE $CONFIG_SBUS if [ "$CONFIG_SBUS" = "y" -o "$CONFIG_PCI" = "y" ]; then tristate ' Sun Happy Meal 10/100baseT support' CONFIG_HAPPYMEAL fi dep_tristate ' Sun BigMAC 10/100baseT support (EXPERIMENTAL)' CONFIG_SUNBMAC $CONFIG_SBUS $CONFIG_EXPERIMENTAL dep_tristate ' Sun QuadEthernet support' CONFIG_SUNQE $CONFIG_SBUS - dep_tristate ' Sun LANCE support' CONFIG_SUNLANCE $CONFIG_SBUS dep_tristate ' Sun GEM support' CONFIG_SUNGEM $CONFIG_PCI bool ' 3COM cards' CONFIG_NET_VENDOR_3COM if [ "$CONFIG_NET_VENDOR_3COM" = "y" ]; then Index: drivers/pci/pci.ids =================================================================== RCS file: /cvsroot/linuxsh/linux/drivers/pci/pci.ids,v retrieving revision 1.6 diff -u -3 -p -r1.6 pci.ids --- drivers/pci/pci.ids 4 Apr 2002 09:03:55 -0000 1.6 +++ drivers/pci/pci.ids 5 Apr 2002 04:41:03 -0000 @@ -824,8 +824,8 @@ 0074 56k Voice Modem 1033 8014 RCV56ACF 56k Voice Modem 009b Vrc5476 - 00a6 VRC5477 AC97 - 00e0 USB 2.0 + 00a6 VRC5477 AC97 + 00e0 USB 2.0 1034 Framatome Connectors USA Inc. 1035 Comp. & Comm. Research Lab 1036 Future Domain Corp. @@ -5481,6 +5481,7 @@ C 0c Serial bus controller 03 USB Controller 00 UHCI 10 OHCI + 20 EHCI 80 Unspecified fe USB Device 04 Fibre Channel Index: drivers/video/epson1355fb.c =================================================================== RCS file: /cvsroot/linuxsh/linux/drivers/video/epson1355fb.c,v retrieving revision 1.1.1.1 diff -u -3 -p -r1.1.1.1 epson1355fb.c --- drivers/video/epson1355fb.c 15 Oct 2001 20:45:05 -0000 1.1.1.1 +++ drivers/video/epson1355fb.c 5 Apr 2002 04:41:03 -0000 @@ -500,7 +500,7 @@ int __init e1355fb_init(void) fb_info.gen.fbhw->detect(); strcpy(fb_info.gen.info.modename, "SED1355"); fb_info.gen.info.changevar = NULL; - fb_info.gen.info.node = -1; + fb_info.gen.info.node = NODEV; fb_info.gen.info.fbops = &e1355fb_ops; fb_info.gen.info.disp = &disp; fb_info.gen.parsize = sizeof(struct e1355_par); -- |
