diff options
| author | Dmitry Torokhov | 2013-03-18 03:40:50 +0100 |
|---|---|---|
| committer | Dmitry Torokhov | 2013-03-18 03:40:50 +0100 |
| commit | 688d794c4c3f8b08c814381ee2edd3ede5856056 (patch) | |
| tree | ef680add71e2a9588d07d8b594edbc1b5cd127d7 /include/uapi/linux/input.h | |
| parent | USB: cdc-acm - blacklist IMS PCU device (diff) | |
| parent | Linux 3.9-rc3 (diff) | |
| download | kernel-qcow2-linux-688d794c4c3f8b08c814381ee2edd3ede5856056.tar.gz kernel-qcow2-linux-688d794c4c3f8b08c814381ee2edd3ede5856056.tar.xz kernel-qcow2-linux-688d794c4c3f8b08c814381ee2edd3ede5856056.zip | |
Merge tag 'v3.9-rc3' into next
Merge with mainline to bring in module_platform_driver_probe() and
devm_ioremap_resource().
Diffstat (limited to 'include/uapi/linux/input.h')
| -rw-r--r-- | include/uapi/linux/input.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/input.h b/include/uapi/linux/input.h index 6e4e3c6b3961..4649ee35b605 100644 --- a/include/uapi/linux/input.h +++ b/include/uapi/linux/input.h @@ -856,6 +856,7 @@ struct input_keymap_entry { #define MSC_GESTURE 0x02 #define MSC_RAW 0x03 #define MSC_SCAN 0x04 +#define MSC_TIMESTAMP 0x05 #define MSC_MAX 0x07 #define MSC_CNT (MSC_MAX+1) |