aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/input/Kconfig
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2006-12-08 12:41:30 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2006-12-08 13:43:20 -0500
commit63f3861d2fbf8ccbad1386ac9ac8b822c036ea00 (patch)
treef95ff72d8e8bb99bea2e4ad0526d606c81bd9229 /drivers/usb/input/Kconfig
parent4c2ae844b5ef85fd4b571c9c91ac48afa6ef2dfc (diff)
[PATCH] Generic HID layer - build
This modifies Makefiles and Kconfigs to properly reflect the creation of generic HID layer. It also removes the dependency of BROKEN, which was introduced by the first patch in series (see the comment). Also updates credits. Signed-off-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/input/Kconfig')
-rw-r--r--drivers/usb/input/Kconfig21
1 files changed, 6 insertions, 15 deletions
diff --git a/drivers/usb/input/Kconfig b/drivers/usb/input/Kconfig
index 9b075319ed5e..8a62d4785755 100644
--- a/drivers/usb/input/Kconfig
+++ b/drivers/usb/input/Kconfig
@@ -6,9 +6,10 @@ comment "USB Input Devices"
6 6
7config USB_HID 7config USB_HID
8 tristate "USB Human Interface Device (full HID) support" 8 tristate "USB Human Interface Device (full HID) support"
9 depends on USB && BROKEN 9 default y
10 depends on USB && HID
10 ---help--- 11 ---help---
11 Say Y here if you want full HID support to connect keyboards, 12 Say Y here if you want full HID support to connect USB keyboards,
12 mice, joysticks, graphic tablets, or any other HID based devices 13 mice, joysticks, graphic tablets, or any other HID based devices
13 to your computer via USB. You also need to select HID Input layer 14 to your computer via USB. You also need to select HID Input layer
14 support (below) if you want to use keyboards, mice, joysticks and 15 support (below) if you want to use keyboards, mice, joysticks and
@@ -27,20 +28,10 @@ config USB_HID
27comment "Input core support is needed for USB HID input layer or HIDBP support" 28comment "Input core support is needed for USB HID input layer or HIDBP support"
28 depends on USB_HID && INPUT=n 29 depends on USB_HID && INPUT=n
29 30
30config USB_HIDINPUT 31config USB_HID_POWERBOOK
31 bool "HID input layer support"
32 default y
33 depends on INPUT && USB_HID
34 help
35 Say Y here if you want to use a USB keyboard, mouse or joystick,
36 or any other HID input device.
37
38 If unsure, say Y.
39
40config USB_HIDINPUT_POWERBOOK
41 bool "Enable support for iBook/PowerBook special keys" 32 bool "Enable support for iBook/PowerBook special keys"
42 default n 33 default n
43 depends on USB_HIDINPUT 34 depends on USB_HID
44 help 35 help
45 Say Y here if you want support for the special keys (Fn, Numlock) on 36 Say Y here if you want support for the special keys (Fn, Numlock) on
46 Apple iBooks and PowerBooks. 37 Apple iBooks and PowerBooks.
@@ -49,7 +40,7 @@ config USB_HIDINPUT_POWERBOOK
49 40
50config HID_FF 41config HID_FF
51 bool "Force feedback support (EXPERIMENTAL)" 42 bool "Force feedback support (EXPERIMENTAL)"
52 depends on USB_HIDINPUT && EXPERIMENTAL 43 depends on USB_HID && EXPERIMENTAL
53 help 44 help
54 Say Y here is you want force feedback support for a few HID devices. 45 Say Y here is you want force feedback support for a few HID devices.
55 See below for a list of supported devices. 46 See below for a list of supported devices.