diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-01-28 15:42:56 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-01-28 15:42:56 +0100 |
| commit | f10698ed6807dc41d021fb7baeb24f9bc4051837 (patch) | |
| tree | fe9229efe38ad31788843a7535bfc3feb89f79a7 /include/uapi/linux/uinput.h | |
| parent | 86038c5ea81b519a8a1fcfcd5e4599aab0cdd119 (diff) | |
| parent | e742f3dc0886a92403d578e8ac771e5e33d06d08 (diff) | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/uapi/linux/uinput.h')
| -rw-r--r-- | include/uapi/linux/uinput.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/uapi/linux/uinput.h b/include/uapi/linux/uinput.h index baeab83deb64..013c9d8db372 100644 --- a/include/uapi/linux/uinput.h +++ b/include/uapi/linux/uinput.h @@ -82,7 +82,7 @@ struct uinput_ff_erase { * The complete sysfs path is then /sys/devices/virtual/input/--NAME-- * Usually, it is in the form "inputN" */ -#define UI_GET_SYSNAME(len) _IOC(_IOC_READ, UINPUT_IOCTL_BASE, 300, len) +#define UI_GET_SYSNAME(len) _IOC(_IOC_READ, UINPUT_IOCTL_BASE, 44, len) /** * UI_GET_VERSION - Return version of uinput protocol @@ -91,7 +91,7 @@ struct uinput_ff_erase { * the integer pointed to by the ioctl argument. The protocol version * is hard-coded in the kernel and is independent of the uinput device. */ -#define UI_GET_VERSION _IOR(UINPUT_IOCTL_BASE, 301, unsigned int) +#define UI_GET_VERSION _IOR(UINPUT_IOCTL_BASE, 45, unsigned int) /* * To write a force-feedback-capable driver, the upload_effect |