diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-24 22:25:08 +0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-24 22:25:08 +0400 |
commit | a53e77fa57145cef6e2a63925db3d426128b2335 (patch) | |
tree | e6f1f9a16b46ff56f2375b01ffb5a314d9bad388 /drivers/hid/Kconfig | |
parent | 8554cc18db47a4d2876852dad72ce3fb0561c3a7 (diff) | |
parent | d446014162ed2ce1c5181b52c6d5f7492acbdade (diff) | |
download | linux-a53e77fa57145cef6e2a63925db3d426128b2335.tar.xz |
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:
HID: wiimote: Add status and return request handlers
HID: wiimote: Add drm request
HID: wiimote: Register led class devices
HID: wiimote: Correctly call HID open/close callbacks
HID: wiimote: Simplify synchronization
HID: usbhid: Add support for SiGma Micro chip
HID: add support for new revision of Apple aluminum keyboard
Diffstat (limited to 'drivers/hid/Kconfig')
-rw-r--r-- | drivers/hid/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index 306b15f39c9c..1130a8987125 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -589,6 +589,7 @@ config HID_WACOM_POWER_SUPPLY config HID_WIIMOTE tristate "Nintendo Wii Remote support" depends on BT_HIDP + depends on LEDS_CLASS ---help--- Support for the Nintendo Wii Remote bluetooth device. |