diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-12-27 17:33:20 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-12-27 17:33:20 -0800 |
| commit | 5c461b913a16aed8afa285a1d00414791a9afe33 (patch) | |
| tree | 95c7d32fcb899240e8bc5ab5bfac20d259a81b46 /include/linux/uinput.h | |
| parent | ef11e701f32fb0cd5c5f0f6fb9a9e28fab151219 (diff) | |
| parent | 4f56ce929cab45a3a6e1a81700da52bb9bdbfc0f (diff) | |
| download | linux-5c461b913a16aed8afa285a1d00414791a9afe33.tar.gz linux-5c461b913a16aed8afa285a1d00414791a9afe33.tar.bz2 linux-5c461b913a16aed8afa285a1d00414791a9afe33.zip | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt into next
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) |