diff options
author | 2011-01-06 22:34:59 -0800 | |
---|---|---|
committer | 2011-01-06 22:34:59 -0800 | |
commit | 554738da71004d96e06fb75f4772dfc3b0f47810 (patch) | |
tree | 149a96ce3727025d3b9260961ec94ba8306db278 /include/linux/uinput.h | |
parent | Input: wacom - add support for digitizer in Lenovo W700 (diff) | |
parent | Input: wacom_w8001 - support pen or touch only devices (diff) | |
download | linux-dev-554738da71004d96e06fb75f4772dfc3b0f47810.tar.xz linux-dev-554738da71004d96e06fb75f4772dfc3b0f47810.zip |
Merge branch 'next' into for-linus
Conflicts:
include/linux/input.h
Diffstat (limited to 'include/linux/uinput.h')
-rw-r--r-- | include/linux/uinput.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/uinput.h b/include/linux/uinput.h index 05f7fed2b173..d28c726ede4f 100644 --- a/include/linux/uinput.h +++ b/include/linux/uinput.h @@ -104,6 +104,7 @@ struct uinput_ff_erase { #define UI_SET_FFBIT _IOW(UINPUT_IOCTL_BASE, 107, int) #define UI_SET_PHYS _IOW(UINPUT_IOCTL_BASE, 108, char*) #define UI_SET_SWBIT _IOW(UINPUT_IOCTL_BASE, 109, int) +#define UI_SET_PROPBIT _IOW(UINPUT_IOCTL_BASE, 110, int) #define UI_BEGIN_FF_UPLOAD _IOWR(UINPUT_IOCTL_BASE, 200, struct uinput_ff_upload) #define UI_END_FF_UPLOAD _IOW(UINPUT_IOCTL_BASE, 201, struct uinput_ff_upload) |