Merge tag 'v4.0-rc5' into next

[sfrench/cifs-2.6.git] / include / uapi / linux / input.h

diff --git a/include/uapi/linux/input.h b/include/uapi/linux/input.h
index eff1cf18031ef29c04b46db96b34e65f9f782ec1..8ddbf1fbbed5255291e58575933eb2a3adbb29e7 100644 (file)
--- a/include/uapi/linux/input.h
+++ b/include/uapi/linux/input.h
@@ -166,6 +166,7 @@ struct input_keymap_entry {
 #define INPUT_PROP_SEMI_MT             0x03    /* touch rectangle only */
 #define INPUT_PROP_TOPBUTTONPAD                0x04    /* softbuttons at top of pad */
 #define INPUT_PROP_POINTING_STICK      0x05    /* is a pointing stick */
+#define INPUT_PROP_ACCELEROMETER       0x06    /* has accelerometer */
 
 #define INPUT_PROP_MAX                 0x1f
 #define INPUT_PROP_CNT                 (INPUT_PROP_MAX + 1)