History

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

Pull input updates from Dmitry: - a new driver for Zeitech touchscreen controller - a new driver for Samsung "touchkeys" - touchscreen driver for Moorestown platform has been removed because platform support is gone - MPU3050 accelerometer driver was removed in favor of IIO driver - miscellaneous driver cleanup and fixes * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (88 commits) Input: zet6223 - export OF device ID as module aliases Input: tsc2004/5 - switch to using generic device properties Input: tsc2004/5 - fix regulator handling Input: tsc2005 - add OF device table Input: add driver for Zeitec ZET6223 Input: joydev - do not report stale values on first open Input: synaptics-rmi4 - forward upper mechanical buttons to PS/2 guest Input: synaptics-rmi4 - clean up F30 implementation Input: synaptics - use SERIO_OOB_DATA to handle trackstick buttons Input: psmouse - add a custom serio protocol to send extra information Input: synaptics-rmi4 - fix error return code in rmi_probe_interrupts() Input: xpad - restore LED state after device resume Input: synaptics-rmi4 - add rmi_find_function() Input: xpad - fix stuck mode button on Xbox One S pad Input: joydev - use clamp() macro Input: refuse to register absolute devices without absinfo Input: synaptics-rmi4 - add sysfs interfaces for hardware IDs Input: synaptics-rmi4 - add sysfs attribute update_fw_status Input: mousedev - stop offering PS/2 to userspace by default Input: tca8418 - switch to using generic device properties ...

Linus Torvalds committed 9 years ago

Commit d5dee392 parents 4cc4b93 6e11617132 files · +1843 −2196Browse files

Showing the changes to include/uapi/linux (1 of 132 files). Show all

Unified · Split

include/uapi/linux/serio.h+4−3
@@ -17,9 +17,10 @@ · 16 unmodified lines
1717 /*
1818 * bit masks for use in "interrupt" flags (3rd argument)
1919 */
20−#define SERIO_TIMEOUT 1
21−#define SERIO_PARITY 2
22−#define SERIO_FRAME 4
20+#define SERIO_TIMEOUT BIT(0)
21+#define SERIO_PARITY BIT(1)
22+#define SERIO_FRAME BIT(2)
23+#define SERIO_OOB_DATA BIT(3)
2324
2425 /*
2526 * Serio types