diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2015-04-13 17:43:34 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2015-04-13 17:43:34 -0400 |
| commit | 2e455c27bddbf8cf6d1039daea40de8e6865c453 (patch) | |
| tree | 3fd892aeae61b105e3c5c979550aabf54109a656 /include/linux/hid-sensor-ids.h | |
| parent | 05f6d02521d4c7a656c5135d6d81c345ce531ac0 (diff) | |
| parent | b2eafd7282fdfd148fc09032540b0ff42bfedfbf (diff) | |
Merge branch 'for-4.1/sensor-hub' into for-linus
Conflicts:
drivers/iio/common/hid-sensors/hid-sensor-trigger.c
include/linux/hid-sensor-hub.h
Diffstat (limited to 'include/linux/hid-sensor-ids.h')
| -rw-r--r-- | include/linux/hid-sensor-ids.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/hid-sensor-ids.h b/include/linux/hid-sensor-ids.h index 109f0e633e01..f2ee90aed0c2 100644 --- a/include/linux/hid-sensor-ids.h +++ b/include/linux/hid-sensor-ids.h | |||
| @@ -21,6 +21,8 @@ | |||
| 21 | 21 | ||
| 22 | #define HID_MAX_PHY_DEVICES 0xFF | 22 | #define HID_MAX_PHY_DEVICES 0xFF |
| 23 | 23 | ||
| 24 | #define HID_USAGE_SENSOR_COLLECTION 0x200001 | ||
| 25 | |||
| 24 | /* Accel 3D (200073) */ | 26 | /* Accel 3D (200073) */ |
| 25 | #define HID_USAGE_SENSOR_ACCEL_3D 0x200073 | 27 | #define HID_USAGE_SENSOR_ACCEL_3D 0x200073 |
| 26 | #define HID_USAGE_SENSOR_DATA_ACCELERATION 0x200452 | 28 | #define HID_USAGE_SENSOR_DATA_ACCELERATION 0x200452 |