diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-22 09:23:23 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-22 09:23:23 -0800 |
commit | 0bf98542a07ee1341830dcc4be63df85645f76b9 (patch) | |
tree | 9945a92ea183d5d5c2989f5f12bc56d27920f3d2 /drivers/usb/input/usbhid.h | |
parent | b4a2c87dada12010239b4d5f8f9bc0eb964a614f (diff) | |
parent | d8c8a393166d6283003fb111d0b4a40931c0eda4 (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:
hid-core.c: Adds GTCO CalComp Interwrite IPanel PIDs to blacklist
HID: put usb_interface instead of usb_device into hid->dev to fix udevinfo breakage
HID: add missing RX, RZ and RY enum values to hid-debug output
HID: hid/hid-input.c doesn't need to include linux/usb/input.h
HID: compilation fix when DEBUG_DATA is defined
HID: proper LED-mapping for SpaceNavigator
HID: update MAINTAINERS entry for USB-HID
HID: GEYSER4_ISO needs quirk
HID: fix some ARM builds due to HID brokenness - make USB_HID depend on INPUT
Diffstat (limited to 'drivers/usb/input/usbhid.h')
-rw-r--r-- | drivers/usb/input/usbhid.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/input/usbhid.h b/drivers/usb/input/usbhid.h index 830107e5251..0023f96d429 100644 --- a/drivers/usb/input/usbhid.h +++ b/drivers/usb/input/usbhid.h @@ -80,5 +80,8 @@ struct usbhid_device { }; +#define hid_to_usb_dev(hid_dev) \ + container_of(hid_dev->dev->parent, struct usb_device, dev) + #endif |