netvm: propagate page->pfmemalloc to skb

[mirror_ubuntu-artful-kernel.git] / include / linux / input.h

diff --git a/include/linux/input.h b/include/linux/input.h
index 2740d080ec6b7607fa1daba2bb2f72395fe34a7f..725dcd0f63a4bf262f05555c528a20c68d8b1a75 100644 (file)
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -807,18 +807,20 @@ struct input_keymap_entry {
 #define ABS_MT_WIDTH_MAJOR     0x32    /* Major axis of approaching ellipse */
 #define ABS_MT_WIDTH_MINOR     0x33    /* Minor axis (omit if circular) */
 #define ABS_MT_ORIENTATION     0x34    /* Ellipse orientation */
-#define ABS_MT_POSITION_X      0x35    /* Center X ellipse position */
-#define ABS_MT_POSITION_Y      0x36    /* Center Y ellipse position */
+#define ABS_MT_POSITION_X      0x35    /* Center X touch position */
+#define ABS_MT_POSITION_Y      0x36    /* Center Y touch position */
 #define ABS_MT_TOOL_TYPE       0x37    /* Type of touching device */
 #define ABS_MT_BLOB_ID         0x38    /* Group a set of packets as a blob */
 #define ABS_MT_TRACKING_ID     0x39    /* Unique ID of initiated contact */
 #define ABS_MT_PRESSURE                0x3a    /* Pressure on contact area */
 #define ABS_MT_DISTANCE                0x3b    /* Contact hover distance */
+#define ABS_MT_TOOL_X          0x3c    /* Center X tool position */
+#define ABS_MT_TOOL_Y          0x3d    /* Center Y tool position */
 
 #ifdef __KERNEL__
 /* Implementation details, userspace should not care about these */
 #define ABS_MT_FIRST           ABS_MT_TOUCH_MAJOR
-#define ABS_MT_LAST            ABS_MT_DISTANCE
+#define ABS_MT_LAST            ABS_MT_TOOL_Y
 #endif
 
 #define ABS_MAX                        0x3f