diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-19 13:32:40 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-19 13:32:40 -0500 |
| commit | f238085415c56618e042252894f2fcc971add645 (patch) | |
| tree | d69f821381995a7d377283f962583075dc149739 /drivers/usb | |
| parent | a240d9f1d8e6421cb970632b93e71b2f66c2cd70 (diff) | |
| parent | 4ef4caad41630c7caa6e2b94c6e7dda7e9689714 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
[PATCH] Generic HID layer - update MAINTAINERS
input/hid: Supporting more keys from the HUT Consumer Page
[PATCH] Generic HID layer - build: USB_HID should select HID
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/input/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/input/Kconfig b/drivers/usb/input/Kconfig index 8a62d4785755..e308f6dc2b87 100644 --- a/drivers/usb/input/Kconfig +++ b/drivers/usb/input/Kconfig | |||
| @@ -7,7 +7,8 @@ comment "USB Input Devices" | |||
| 7 | config USB_HID | 7 | config USB_HID |
| 8 | tristate "USB Human Interface Device (full HID) support" | 8 | tristate "USB Human Interface Device (full HID) support" |
| 9 | default y | 9 | default y |
| 10 | depends on USB && HID | 10 | depends on USB |
| 11 | select HID | ||
| 11 | ---help--- | 12 | ---help--- |
| 12 | Say Y here if you want full HID support to connect USB keyboards, | 13 | Say Y here if you want full HID support to connect USB keyboards, |
| 13 | mice, joysticks, graphic tablets, or any other HID based devices | 14 | mice, joysticks, graphic tablets, or any other HID based devices |