diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-24 16:30:14 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-24 16:30:14 -0400 |
| commit | e8ff13b0bf88b5e696323a1eec877783d965b3c6 (patch) | |
| tree | aa55093da5ee435f0d2fa8ffede8973f426dbd67 /include/linux/Kbuild | |
| parent | 0cd5ff591ab6473355d5a6a47f7694def28e451d (diff) | |
| parent | c062c4d1de57789bf15f7641a24c429eeb8a1c6a (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
Pull HID updates from Jiri Kosina:
"The list of changes worth pointing out explicitly:
- We are getting 'UHID', which is a new framework for implementing HID
transport drivers in userspace (this is different from HIDRAW, which
is transport-independent and provides report parsing facilities;
uhid is for the other (transport) part of the pipeline).
It's needed for (and currently being used by) Bluetooth-LowEnergy,
as its specification mandates things we don't want in the kernel.
Written by David Herrmann.
- there have been quite a few bugs in runtime suspend/resume paths
(probably never reported to actually happen in the wild, but still).
Alan Stern fixed those.
- a few other driver updates and fixes and random new device support."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (45 commits)
HID: add ASUS AIO keyboard model AK1D
HID: add support for Cypress barcode scanner 04B4:ED81
HID: Allow drivers to be their own listener
HID: usbhid: fix error paths in suspend
HID: usbhid: check for suspend or reset before restarting
HID: usbhid: replace HID_REPORTED_IDLE with HID_SUSPENDED
HID: usbhid: inline some simple routines
HID: usbhid: fix autosuspend calls
HID: usbhid: fix use-after-free bug
HID: hid-core: optimize in case of hidraw
HID: hidraw: fix list->buffer memleak
HID: uhid: Fix sending events with invalid data
HID: roccat: added sensor sysfs attribute for Savu
HID: Add driver for Holtek based keyboards with broken HID
HID: Add suport for the brightness control keys on HP keyboards
HID: magicmouse: Implement Multi-touch Protocol B (MT-B)
HID: magicmouse: Removing report_touches switch
HID: roccat: rename roccat_common functions to roccat_common2
HID: roccat: fix wrong hid_err usage on struct usb_device
HID: roccat: move functionality to roccat-common
...
Diffstat (limited to 'include/linux/Kbuild')
| -rw-r--r-- | include/linux/Kbuild | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild index 8760be30b375..cb2a7d1ad47b 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild | |||
| @@ -376,6 +376,7 @@ header-y += tty.h | |||
| 376 | header-y += types.h | 376 | header-y += types.h |
| 377 | header-y += udf_fs_i.h | 377 | header-y += udf_fs_i.h |
| 378 | header-y += udp.h | 378 | header-y += udp.h |
| 379 | header-y += uhid.h | ||
| 379 | header-y += uinput.h | 380 | header-y += uinput.h |
| 380 | header-y += uio.h | 381 | header-y += uio.h |
| 381 | header-y += ultrasound.h | 382 | header-y += ultrasound.h |