Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
include/linux/hid-sensor-ids.h between commit 751d17e23a9f ("iio:
hid-sensors: Fix power and report state") from the staging.current tree
and commit 64528d03d723 ("iio: hid-sensors: accelerometer: Add
sensitivity") from the staging tree.I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell s...@canb.auug.org.au diff --cc include/linux/hid-sensor-ids.h index 8323775ac21d,4cc165887b09..000000000000 --- a/include/linux/hid-sensor-ids.h +++ b/include/linux/hid-sensor-ids.h @@@ -117,16 -121,8 +121,20 @@@ #define HID_USAGE_SENSOR_PROP_REPORT_STATE 0x200316 #define HID_USAGE_SENSOR_PROY_POWER_STATE 0x200319 +/* 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 + + /* Per data field properties */ + #define HID_USAGE_SENSOR_DATA_MOD_NONE 0x00 + #define HID_USAGE_SENSOR_DATA_MOD_CHANGE_SENSITIVITY_ABS 0x1000 + #endif
pgp6ikLfO1KPi.pgp
Description: PGP signature
