Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c362d46 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Input: move USB gamepads under drivers/input/joystick 



This will allow concentrating all input devices in one place
in {menu|x|q}config.

Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d05e84e6

drivers/input/joystick/Kconfig

+16 −2
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@ 
# Joystick driver configuration

# Joystick driver configuration

#

#

menuconfig INPUT_JOYSTICK

menuconfig INPUT_JOYSTICK

	bool "Joysticks"

	bool "Joysticks/Gamepads"

	help

	help

	  If you have a joystick, 6dof controller, gamepad, steering wheel,

	  If you have a joystick, 6dof controller, gamepad, steering wheel,

	  weapon control system or something like that you can say Y here

	  weapon control system or something like that you can say Y here
@@ -196,7 +196,7 @@ config JOYSTICK_TWIDJOY 
config JOYSTICK_DB9

config JOYSTICK_DB9

	tristate "Multisystem, Sega Genesis, Saturn joysticks and gamepads"

	tristate "Multisystem, Sega Genesis, Saturn joysticks and gamepads"

	depends on PARPORT

	depends on PARPORT

	---help---

	help

	  Say Y here if you have a Sega Master System gamepad, Sega Genesis

	  Say Y here if you have a Sega Master System gamepad, Sega Genesis

	  gamepad, Sega Saturn gamepad, or a Multisystem -- Atari, Amiga,

	  gamepad, Sega Saturn gamepad, or a Multisystem -- Atari, Amiga,

	  Commodore, Amstrad CPC joystick connected to your parallel port.

	  Commodore, Amstrad CPC joystick connected to your parallel port.
@@ -253,4 +253,18 @@ config JOYSTICK_JOYDUMP 
	  To compile this driver as a module, choose M here: the

	  To compile this driver as a module, choose M here: the

	  module will be called joydump.

	  module will be called joydump.





config JOYSTICK_XPAD

	tristate "X-Box gamepad support"

	select USB

	help

	  Say Y here if you want to use the X-Box pad with your computer.

	  Make sure to say Y to "Joystick support" (CONFIG_INPUT_JOYDEV)

	  and/or "Event interface support" (CONFIG_INPUT_EVDEV) as well.



	  For information about how to connect the X-Box pad to USB, see

	  <file:Documentation/input/xpad.txt>.



	  To compile this driver as a module, choose M here: the

	  module will be called xpad.



endif
 
endif

drivers/input/joystick/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -26,5 +26,6 @@ obj-$(CONFIG_JOYSTICK_TMDC) += tmdc.o 
obj-$(CONFIG_JOYSTICK_TURBOGRAFX)	+= turbografx.o

obj-$(CONFIG_JOYSTICK_TURBOGRAFX)	+= turbografx.o

obj-$(CONFIG_JOYSTICK_TWIDJOY)		+= twidjoy.o

obj-$(CONFIG_JOYSTICK_TWIDJOY)		+= twidjoy.o

obj-$(CONFIG_JOYSTICK_WARRIOR)		+= warrior.o

obj-$(CONFIG_JOYSTICK_WARRIOR)		+= warrior.o

obj-$(CONFIG_JOYSTICK_XPAD)		+= xpad.o





obj-$(CONFIG_JOYSTICK_IFORCE)		+= iforce/
 
obj-$(CONFIG_JOYSTICK_IFORCE)		+= iforce/

drivers/usb/input/xpad.c→drivers/input/joystick/xpad.c

+0 −0

File moved.

View file

drivers/usb/Makefile

+0 −1
Original line number Original line Diff line number Diff line
@@ -25,7 +25,6 @@ obj-$(CONFIG_USB) += storage/ 




obj-$(CONFIG_USB_ATI_REMOTE)	+= input/

obj-$(CONFIG_USB_ATI_REMOTE)	+= input/

obj-$(CONFIG_USB_POWERMATE)	+= input/

obj-$(CONFIG_USB_POWERMATE)	+= input/

obj-$(CONFIG_USB_XPAD)		+= input/





obj-$(CONFIG_USB_CATC)		+= net/

obj-$(CONFIG_USB_CATC)		+= net/

obj-$(CONFIG_USB_KAWETH)	+= net/

obj-$(CONFIG_USB_KAWETH)	+= net/

drivers/usb/input/Kconfig

+0 −14
Original line number Original line Diff line number Diff line
@@ -33,20 +33,6 @@ config USB_YEALINK 
	  To compile this driver as a module, choose M here: the module will be

	  To compile this driver as a module, choose M here: the module will be

	  called yealink.

	  called yealink.





config USB_XPAD

	tristate "X-Box gamepad support"

	depends on USB && INPUT

	---help---

	  Say Y here if you want to use the X-Box pad with your computer.

	  Make sure to say Y to "Joystick support" (CONFIG_INPUT_JOYDEV)

	  and/or "Event interface support" (CONFIG_INPUT_EVDEV) as well.



	  For information about how to connect the X-Box pad to USB, see

	  <file:Documentation/input/xpad.txt>.



	  To compile this driver as a module, choose M here: the

	  module will be called xpad.

	  

config USB_ATI_REMOTE

config USB_ATI_REMOTE

	tristate "ATI / X10 USB RF remote control"

	tristate "ATI / X10 USB RF remote control"

	depends on USB && INPUT

	depends on USB && INPUT