diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-01-31 12:24:00 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-01-31 12:24:00 -0500 |
| commit | 30716e07ef511ec7525c07eb1e8060ba8943c2a2 (patch) | |
| tree | eb6a47cae63d3587fa773cc5a16781eaa2c7810b /drivers/usb/input/usbhid.h | |
| parent | 03c79cc56e4497cbd09d74a73c1bd0d1d9a8a16c (diff) | |
| parent | f56df2f4db6e4af87fb8e941cff69f4501a111df (diff) | |
Merge branch 'linus'
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 830107e5251f..0023f96d4294 100644 --- a/drivers/usb/input/usbhid.h +++ b/drivers/usb/input/usbhid.h | |||
| @@ -80,5 +80,8 @@ struct usbhid_device { | |||
| 80 | 80 | ||
| 81 | }; | 81 | }; |
| 82 | 82 | ||
| 83 | #define hid_to_usb_dev(hid_dev) \ | ||
| 84 | container_of(hid_dev->dev->parent, struct usb_device, dev) | ||
| 85 | |||
| 83 | #endif | 86 | #endif |
| 84 | 87 | ||