summaryrefslogtreecommitdiff
path: root/include/linux/uinput.h
diff options
context:
space:
mode:
authorVojtech Pavlik <vojtech@twilight.ucw.cz>2002-07-25 02:57:12 +0200
committerVojtech Pavlik <vojtech@twilight.ucw.cz>2002-07-25 02:57:12 +0200
commit7d30d1df118d5b27a559e590475897e1b09f0ebe (patch)
tree265dd5ea0002f735fd741434c21d64cbeedcd969 /include/linux/uinput.h
parent5ab506c839e31507399184d6952b9bb62ff2188f (diff)
This patch by Brad Hards replaces the four id* fields of the input
struct by a single struct to simplify passing it around and to userspace.
Diffstat (limited to 'include/linux/uinput.h')
-rw-r--r--include/linux/uinput.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/include/linux/uinput.h b/include/linux/uinput.h
index 6754ab4e0952..528b27a21d78 100644
--- a/include/linux/uinput.h
+++ b/include/linux/uinput.h
@@ -64,10 +64,7 @@ struct uinput_device {
#define UINPUT_MAX_NAME_SIZE 80
struct uinput_user_dev {
char name[UINPUT_MAX_NAME_SIZE];
- unsigned short idbus;
- unsigned short idvendor;
- unsigned short idproduct;
- unsigned short idversion;
+ struct input_devinfo id;
int ff_effects_max;
int absmax[ABS_MAX + 1];
int absmin[ABS_MAX + 1];