diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-03-11 09:51:25 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-03-11 09:51:25 -0800 |
| commit | 62d5bdf972ebcfc99f72f734ae979713e4ca6450 (patch) | |
| tree | 690d4210d454808196c32efca408b46ffec9a5d3 /include/uapi | |
| parent | e52d83986c5a0b843e45aa89b84d224ba7b9b8ca (diff) | |
| parent | 48147b9768b83265bf2e1211bcadeca035011380 (diff) | |
Merge branch 'synaptics-rmi4' into next
Bring in support for devices using Synaptics RMI4 protocol, including
RMI4 bus, 2D sensor and button handlers, and SPI and I2C interface
drivers.
Diffstat (limited to 'include/uapi')
| -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 2758687300b4..01113841190d 100644 --- a/include/uapi/linux/input.h +++ b/include/uapi/linux/input.h @@ -246,6 +246,7 @@ struct input_mask { #define BUS_GSC 0x1A #define BUS_ATARI 0x1B #define BUS_SPI 0x1C +#define BUS_RMI 0x1D /* * MT_TOOL types |