diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-08-07 08:31:48 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-08-07 08:31:48 +0200 |
| commit | fc8104bc5a3f6f49d79f45f2706f79f77a9fb2ae (patch) | |
| tree | c30f3c27cb719f1e268f485640cfab9898557676 /include | |
| parent | Input: hyperv-keyboard - register as a wakeup source (diff) | |
| parent | Input: wacom - only register once the MODULE_* macros (diff) | |
| download | linux-fc8104bc5a3f6f49d79f45f2706f79f77a9fb2ae.tar.xz linux-fc8104bc5a3f6f49d79f45f2706f79f77a9fb2ae.zip | |
Merge branch 'wacom' into next
Merge large update to Wacom driver, converting it from USB to a HID
driver and unifying wired and bluetooth support, from Benjamin
Tissoires.
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/hid.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h index 77632cf159c0..07fa80671db0 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -311,6 +311,11 @@ struct hid_item { #define HID_GROUP_RMI 0x0100 /* + * Vendor specific HID device groups + */ +#define HID_GROUP_WACOM 0x0101 + +/* * This is the global environment of the parser. This information is * persistent for main-items. The global environment can be saved and * restored with PUSH/POP statements. |