6 files changed, 17 insertions, 18 deletions

diff --git a/drivers/input/joystick/Kconfig b/drivers/input/joystick/Kconfig
index 271263443c37..82f563e24fdb 100644
--- a/drivers/input/joystick/Kconfig
+++ b/drivers/input/joystick/Kconfig
@@ -2,7 +2,7 @@
 # Joystick driver configuration
 #
 menuconfig INPUT_JOYSTICK
-        bool "Joysticks"
+        bool "Joysticks/Gamepads"
         help
           If you have a joystick, 6dof controller, gamepad, steering wheel,
           weapon control system or something like that you can say Y here
@@ -196,7 +196,7 @@ config JOYSTICK_TWIDJOY
 config JOYSTICK_DB9
         tristate "Multisystem, Sega Genesis, Saturn joysticks and gamepads"
         depends on PARPORT
-        ---help---
+        help
           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.
@@ -253,4 +253,18 @@ config JOYSTICK_JOYDUMP
           To compile this driver as a module, choose M here: the
           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
diff --git a/drivers/input/joystick/Makefile b/drivers/input/joystick/Makefile
index 5231f6ff75b8..e855abb0cc51 100644
--- a/drivers/input/joystick/Makefile
+++ b/drivers/input/joystick/Makefile
@@ -26,5 +26,6 @@ obj-$(CONFIG_JOYSTICK_TMDC)		+= tmdc.o
 obj-$(CONFIG_JOYSTICK_TURBOGRAFX)       += turbografx.o
 obj-$(CONFIG_JOYSTICK_TWIDJOY)          += twidjoy.o
 obj-$(CONFIG_JOYSTICK_WARRIOR)          += warrior.o
+obj-$(CONFIG_JOYSTICK_XPAD)             += xpad.o
 
 obj-$(CONFIG_JOYSTICK_IFORCE)           += iforce/
diff --git a/drivers/usb/input/xpad.c b/drivers/input/joystick/xpad.c
index 735723912950..735723912950 100644
--- a/drivers/usb/input/xpad.c
+++ b/drivers/input/joystick/xpad.c
diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
index 2b6caf674e4a..7059a64637a8 100644
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
@@ -25,7 +25,6 @@ obj-$(CONFIG_USB)		+= storage/
 
 obj-$(CONFIG_USB_ATI_REMOTE)    += input/
 obj-$(CONFIG_USB_POWERMATE)     += input/
-obj-$(CONFIG_USB_XPAD)          += input/
 
 obj-$(CONFIG_USB_CATC)          += net/
 obj-$(CONFIG_USB_KAWETH)        += net/
diff --git a/drivers/usb/input/Kconfig b/drivers/usb/input/Kconfig
index 68109a02b6cd..19228780ed84 100644
--- a/drivers/usb/input/Kconfig
+++ b/drivers/usb/input/Kconfig
@@ -33,20 +33,6 @@ config USB_YEALINK
           To compile this driver as a module, choose M here: the module will be
           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
         tristate "ATI / X10 USB RF remote control"
         depends on USB && INPUT
diff --git a/drivers/usb/input/Makefile b/drivers/usb/input/Makefile
index c8b843ce167c..d2cbb0ec7963 100644
--- a/drivers/usb/input/Makefile
+++ b/drivers/usb/input/Makefile
@@ -7,7 +7,6 @@ obj-$(CONFIG_USB_ATI_REMOTE2)	+= ati_remote2.o
 obj-$(CONFIG_USB_KEYSPAN_REMOTE)        += keyspan_remote.o
 obj-$(CONFIG_USB_POWERMATE)     += powermate.o
 obj-$(CONFIG_USB_YEALINK)       += yealink.o
-obj-$(CONFIG_USB_XPAD)          += xpad.o
 obj-$(CONFIG_USB_APPLETOUCH)    += appletouch.o
 
 ifeq ($(CONFIG_USB_DEBUG),y)