History

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

Pull input fixes from Dmitry Torokhov: "A few last-minute updates for the input subsystem" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: ts4800-ts - add missing of_node_put after calling of_parse_phandle Input: synaptics-rmi4 - use of_get_child_by_name() to fix refcount Revert "Input: wacom_w8001 - drop use of ABS_MT_TOOL_TYPE" Input: xpad - validate USB endpoint count during probe Input: add SW_PEN_INSERTED define

Linus Torvalds committed 10 years ago

Commit 63151702 parents 8dcf5a8 6a5029e5 files · +16 −8Browse files

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

Unified · Split

include/uapi/linux/input-event-codes.h+1−0
@@ -780,6 +780,7 @@ · 779 unmodified lines
780#define SW_ROTATE_LOCK 0x0c /* set = rotate locked/disabled */780#define SW_ROTATE_LOCK 0x0c /* set = rotate locked/disabled */
781#define SW_LINEIN_INSERT 0x0d /* set = inserted */781#define SW_LINEIN_INSERT 0x0d /* set = inserted */
782#define SW_MUTE_DEVICE 0x0e /* set = device disabled */782#define SW_MUTE_DEVICE 0x0e /* set = device disabled */
783#define SW_PEN_INSERTED 0x0f /* set = pen inserted */
783#define SW_MAX 0x0f784#define SW_MAX 0x0f
784#define SW_CNT (SW_MAX+1)785#define SW_CNT (SW_MAX+1)
785 786