diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2006-12-08 18:41:30 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-12-08 10:43:20 -0800 |
| commit | 63f3861d2fbf8ccbad1386ac9ac8b822c036ea00 (patch) | |
| tree | f95ff72d8e8bb99bea2e4ad0526d606c81bd9229 /drivers/usb/input | |
| parent | 4c2ae844b5ef85fd4b571c9c91ac48afa6ef2dfc (diff) | |
| download | linux-3.10-63f3861d2fbf8ccbad1386ac9ac8b822c036ea00.tar.gz linux-3.10-63f3861d2fbf8ccbad1386ac9ac8b822c036ea00.tar.bz2 linux-3.10-63f3861d2fbf8ccbad1386ac9ac8b822c036ea00.zip | |
[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')
| -rw-r--r-- | drivers/usb/input/Kconfig | 21 | ||||
| -rw-r--r-- | drivers/usb/input/Makefile | 3 |
2 files changed, 6 insertions, 18 deletions
diff --git a/drivers/usb/input/Kconfig b/drivers/usb/input/Kconfig index 9b075319ed5..8a62d478575 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 && BROKEN + 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. diff --git a/drivers/usb/input/Makefile b/drivers/usb/input/Makefile index d946d5213b3..1a24b5bfa05 100644 --- a/drivers/usb/input/Makefile +++ b/drivers/usb/input/Makefile @@ -11,9 +11,6 @@ usbhid-objs := hid-core.o ifeq ($(CONFIG_USB_HIDDEV),y) usbhid-objs += hiddev.o endif -ifeq ($(CONFIG_USB_HIDINPUT),y) - usbhid-objs += hid-input.o -endif ifeq ($(CONFIG_HID_PID),y) usbhid-objs += hid-pidff.o endif |