diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-02-20 15:16:02 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-02-20 15:16:02 -0800 |
| commit | 6e11617fcff3688f70650a3e40addb0043dda137 (patch) | |
| tree | a24f378c1a1e9f627ca1076a8b5bbd2ad7422630 /include/uapi | |
| parent | 722c5ac708b4f5c1fcfad5fed4c95234c8b06590 (diff) | |
| parent | a1b5359271e5c77d5ec8a575b379a6ba3e867097 (diff) | |
Merge branch 'next' into for-linus
Prepare input updates for 4.11 merge window.
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/serio.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/uapi/linux/serio.h b/include/uapi/linux/serio.h index f2447a83ac8d..ccd0ccd00f47 100644 --- a/include/uapi/linux/serio.h +++ b/include/uapi/linux/serio.h @@ -17,9 +17,10 @@ /* * bit masks for use in "interrupt" flags (3rd argument) */ -#define SERIO_TIMEOUT 1 -#define SERIO_PARITY 2 -#define SERIO_FRAME 4 +#define SERIO_TIMEOUT BIT(0) +#define SERIO_PARITY BIT(1) +#define SERIO_FRAME BIT(2) +#define SERIO_OOB_DATA BIT(3) /* * Serio types |