diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-07-08 12:29:07 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-07-08 12:29:07 +0300 |
| commit | bac931259addd4ca8f705b534ab693c1b367ca1d (patch) | |
| tree | eff070cdcae6c02c315fb81a7b65a8e95596f74e /include/uapi/linux/input.h | |
| parent | b2de43605410d1970dc9e0f349e399f1d561be13 (diff) | |
| parent | a99cde438de0c4c0cecc1d1af1a55a75b10bfdef (diff) | |
| download | linux-bac931259addd4ca8f705b534ab693c1b367ca1d.tar.xz | |
Merge tag 'v4.7-rc6' into ras/core, to pick up fixes before merging new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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 01113841190d..c51494119817 100644 --- a/include/uapi/linux/input.h +++ b/include/uapi/linux/input.h @@ -247,6 +247,7 @@ struct input_mask { #define BUS_ATARI 0x1B #define BUS_SPI 0x1C #define BUS_RMI 0x1D +#define BUS_CEC 0x1E /* * MT_TOOL types |