diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-12-28 02:33:20 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-12-28 02:33:20 +0100 |
| commit | 5c461b913a16aed8afa285a1d00414791a9afe33 (patch) | |
| tree | 95c7d32fcb899240e8bc5ab5bfac20d259a81b46 /drivers/input/misc | |
| parent | Input: bu21013_ts - fix misuse of logical operation in place of bitop (diff) | |
| parent | Input: synaptics - ignore bogus mt packet (diff) | |
| download | linux-5c461b913a16aed8afa285a1d00414791a9afe33.tar.xz linux-5c461b913a16aed8afa285a1d00414791a9afe33.zip | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt into next
Diffstat (limited to 'drivers/input/misc')
| -rw-r--r-- | drivers/input/misc/uinput.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c index bea89722c4e9..82542a1c1098 100644 --- a/drivers/input/misc/uinput.c +++ b/drivers/input/misc/uinput.c @@ -680,6 +680,10 @@ static long uinput_ioctl_handler(struct file *file, unsigned int cmd, retval = uinput_set_bit(arg, swbit, SW_MAX); break; + case UI_SET_PROPBIT: + retval = uinput_set_bit(arg, propbit, INPUT_PROP_MAX); + break; + case UI_SET_PHYS: if (udev->state == UIST_CREATED) { retval = -EINVAL; |