From: Greg Kroah-Hartman Date: Tue, 17 Dec 2013 01:12:04 +0000 (-0800) Subject: Merge 3.13-rc4 into staging-next. X-Git-Tag: v3.14-rc1~13^2~367 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5c5bccb76cb94888f40ebd5584b81646632e9c3f;p=kernel%2Fkernel-generic.git Merge 3.13-rc4 into staging-next. We want the fixes in here as well. Signed-off-by: Greg Kroah-Hartman --- 5c5bccb76cb94888f40ebd5584b81646632e9c3f diff --cc include/linux/hid-sensor-ids.h index 4cc1658,8323775..0bf2eb3 --- a/include/linux/hid-sensor-ids.h +++ b/include/linux/hid-sensor-ids.h @@@ -121,8 -117,16 +121,20 @@@ #define HID_USAGE_SENSOR_PROP_REPORT_STATE 0x200316 #define HID_USAGE_SENSOR_PROY_POWER_STATE 0x200319 +/* Per data field properties */ +#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