diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-11 09:56:05 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-11 09:56:05 -0700 |
commit | 5884c40668a928bba017eaf54e2eb3c01c8a98e6 (patch) | |
tree | 240bdf1b015f0bc2ce8c1811bd0b528c1ef386c2 /drivers/hid/usbhid/Kconfig | |
parent | ee54d2d87a8158d14434c1a3274bd7f713105836 (diff) | |
parent | cdcb44e87bedcf5070eece61f89f9373a3810031 (diff) | |
download | linux-5884c40668a928bba017eaf54e2eb3c01c8a98e6.tar.bz2 |
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid
* 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid:
USB HID: hiddev - fix race between hiddev_send_event() and hiddev_release()
HID: add hooks for getkeycode() and setkeycode() methods
HID: switch to using input_dev->dev.parent
USB HID: Logitech wheel 0x046d/0xc294 needs HID_QUIRK_NOGET quirk
USB HID: usb_buffer_free() cleanup
USB HID: report descriptor of Cypress USB barcode readers needs fixup
Bluetooth HID: HIDP - don't initialize force feedback
USB HID: update CONFIG_USB_HIDINPUT_POWERBOOK description
HID: add input mappings for non-working keys on Logitech S510 remote
Diffstat (limited to 'drivers/hid/usbhid/Kconfig')
-rw-r--r-- | drivers/hid/usbhid/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hid/usbhid/Kconfig b/drivers/hid/usbhid/Kconfig index 7c87bdc538bc..1b4b572f899b 100644 --- a/drivers/hid/usbhid/Kconfig +++ b/drivers/hid/usbhid/Kconfig @@ -25,12 +25,12 @@ comment "Input core support is needed for USB HID input layer or HIDBP support" depends on USB_HID && INPUT=n config USB_HIDINPUT_POWERBOOK - bool "Enable support for iBook/PowerBook special keys" + bool "Enable support for iBook/PowerBook/MacBook/MacBookPro special keys" default n depends on USB_HID help Say Y here if you want support for the special keys (Fn, Numlock) on - Apple iBooks and PowerBooks. + Apple iBooks, PowerBooks, MacBooks and MacBook Pros. If unsure, say N. |