diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-16 17:12:04 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-16 17:12:04 -0800 |
commit | 5c5bccb76cb94888f40ebd5584b81646632e9c3f (patch) | |
tree | ee949fa6cc1dbe2632154b38ef6dd28f6185d218 /include/linux/hid-sensor-ids.h | |
parent | 24b3aa09970304ece816e73c3d7174d0dd315b98 (diff) | |
parent | 319e2e3f63c348a9b66db4667efa73178e18b17d (diff) | |
download | linux-stable-5c5bccb76cb94888f40ebd5584b81646632e9c3f.tar.gz linux-stable-5c5bccb76cb94888f40ebd5584b81646632e9c3f.tar.bz2 linux-stable-5c5bccb76cb94888f40ebd5584b81646632e9c3f.zip |
Merge 3.13-rc4 into staging-next.
We want the fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/hid-sensor-ids.h')
-rw-r--r-- | include/linux/hid-sensor-ids.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/linux/hid-sensor-ids.h b/include/linux/hid-sensor-ids.h index 4cc165887b09..0bf2eb3748dc 100644 --- a/include/linux/hid-sensor-ids.h +++ b/include/linux/hid-sensor-ids.h @@ -125,4 +125,16 @@ #define HID_USAGE_SENSOR_DATA_MOD_NONE 0x00 #define HID_USAGE_SENSOR_DATA_MOD_CHANGE_SENSITIVITY_ABS 0x1000 +/* Power state enumerations */ +#define HID_USAGE_SENSOR_PROP_POWER_STATE_UNDEFINED_ENUM 0x00 +#define HID_USAGE_SENSOR_PROP_POWER_STATE_D0_FULL_POWER_ENUM 0x01 +#define HID_USAGE_SENSOR_PROP_POWER_STATE_D1_LOW_POWER_ENUM 0x02 +#define HID_USAGE_SENSOR_PROP_POWER_STATE_D2_STANDBY_WITH_WAKE_ENUM 0x03 +#define HID_USAGE_SENSOR_PROP_POWER_STATE_D3_SLEEP_WITH_WAKE_ENUM 0x04 +#define HID_USAGE_SENSOR_PROP_POWER_STATE_D4_POWER_OFF_ENUM 0x05 + +/* Report State enumerations */ +#define HID_USAGE_SENSOR_PROP_REPORTING_STATE_NO_EVENTS_ENUM 0x00 +#define HID_USAGE_SENSOR_PROP_REPORTING_STATE_ALL_EVENTS_ENUM 0x01 + #endif |