1 files changed, 6 insertions, 15 deletions

diff --git a/drivers/usb/input/Kconfig b/drivers/usb/input/Kconfig
index 661af7aa6236..8a62d4785755 100644
--- a/drivers/usb/input/Kconfig
+++ b/drivers/usb/input/Kconfig
@@ -6,9 +6,10 @@ comment "USB Input Devices"
 
 config USB_HID
         tristate "USB Human Interface Device (full HID) support"
-        depends on USB
+        default y
+        depends on USB && HID
         ---help---
-          Say Y here if you want full HID support to connect keyboards,
+          Say Y here if you want full HID support to connect USB keyboards,
           mice, joysticks, graphic tablets, or any other HID based devices
           to your computer via USB. You also need to select HID Input layer
           support (below) if you want to use keyboards, mice, joysticks and
@@ -27,20 +28,10 @@ config USB_HID
 comment "Input core support is needed for USB HID input layer or HIDBP support"
         depends on USB_HID && INPUT=n
 
-config USB_HIDINPUT
-        bool "HID input layer support"
-        default y
-        depends on INPUT && USB_HID
-        help
-          Say Y here if you want to use a USB keyboard, mouse or joystick,
-          or any other HID input device.
-
-          If unsure, say Y.
-
-config USB_HIDINPUT_POWERBOOK
+config USB_HID_POWERBOOK
         bool "Enable support for iBook/PowerBook special keys"
         default n
-        depends on USB_HIDINPUT
+        depends on USB_HID
         help
           Say Y here if you want support for the special keys (Fn, Numlock) on
           Apple iBooks and PowerBooks.
@@ -49,7 +40,7 @@ config USB_HIDINPUT_POWERBOOK
 
 config HID_FF
         bool "Force feedback support (EXPERIMENTAL)"
-        depends on USB_HIDINPUT && EXPERIMENTAL
+        depends on USB_HID && EXPERIMENTAL
         help
           Say Y here is you want force feedback support for a few HID devices.
           See below for a list of supported devices.