History

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

Pull input updates from Dmitry Torokhov: "A new driver for slidebar on Ideapad laptops and a bunch of assorted driver fixes" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (32 commits) Input: add SYN_MAX and SYN_CNT constants Input: max11801_ts - convert to devm Input: egalax-ts - fix typo and improve text Input: MAINTAINERS - change maintainer for cyttsp driver Input: cyttsp4 - kill 'defined but not used' compiler warnings Input: add driver for slidebar on Lenovo IdeaPad laptops Input: omap-keypad - set up irq type from DT Input: omap-keypad - enable wakeup capability for keypad. Input: omap-keypad - clear interrupts on open Input: omap-keypad - convert to threaded IRQ Input: omap-keypad - use bitfiled instead of hardcoded values Input: cyttsp4 - remove useless NULL test from cyttsp4_watchdog_timer() Input: wacom - fix error return code in wacom_probe() Input: as5011 - fix error return code in as5011_probe() Input: keyboard, serio - simplify use of devm_ioremap_resource Input: tegra-kbc - simplify use of devm_ioremap_resource Input: htcpen - fix incorrect placement of __initdata Input: qt1070 - add power management ops Input: wistron_btns - add MODULE_DEVICE_TABLE Input: wistron_btns - mark the Medion MD96500 keymap as tested ...

Linus Torvalds committed 13 years ago

Commit 8b8a7df2 parents b04c99e 07176b933 files · +770 −321Browse files

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

Unified · Split

include/uapi/linux/input.h+2−0
@@ -194,6 +194,8 @@ struct input_keymap_entry { · 193 unmodified lines
194#define SYN_CONFIG 1194#define SYN_CONFIG 1
195#define SYN_MT_REPORT 2195#define SYN_MT_REPORT 2
196#define SYN_DROPPED 3196#define SYN_DROPPED 3
197#define SYN_MAX 0xf
198#define SYN_CNT (SYN_MAX+1)
197 199
198/*200/*
199 * Keys and buttons201 * Keys and buttons