diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-05-22 13:32:31 +0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-05-22 13:32:31 +0400 |
| commit | 56ccd186f1837dd418cd094f0e96b3196bbab9ef (patch) | |
| tree | 195cdd3973a1288eb84f51f0ec28a947b333c2c5 /drivers/hid/usbhid/usbhid.h | |
| parent | b3d07e0344ea36dd3f3a2fdbfaab883e1c5ca69e (diff) | |
| parent | d1257081aecf44455fcab8675f1d54e8b242faa1 (diff) | |
| download | linux-56ccd186f1837dd418cd094f0e96b3196bbab9ef.tar.xz | |
Merge branch 'upstream' into for-linus
Conflicts:
drivers/hid/hid-core.c
Diffstat (limited to 'drivers/hid/usbhid/usbhid.h')
| -rw-r--r-- | drivers/hid/usbhid/usbhid.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/usbhid/usbhid.h b/drivers/hid/usbhid/usbhid.h index cb8f703efde5..1883d7b94870 100644 --- a/drivers/hid/usbhid/usbhid.h +++ b/drivers/hid/usbhid/usbhid.h @@ -55,6 +55,7 @@ struct usb_interface *usbhid_find_interface(int minor); #define HID_STARTED 8 #define HID_REPORTED_IDLE 9 #define HID_KEYS_PRESSED 10 +#define HID_NO_BANDWIDTH 11 /* * USB-specific HID struct, to be pointed to |