From: Andrew Morton Signed-off-by: Andrew Morton --- drivers/usb/input/hid.h | 5 +---- include/linux/input.h | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) diff -puN include/linux/input.h~git-input-fixup include/linux/input.h --- a/include/linux/input.h~git-input-fixup +++ a/include/linux/input.h @@ -953,8 +953,7 @@ struct input_dev { unsigned int repeat_key; struct timer_list timer; - int state; - + int dead; int sync; int abs[ABS_MAX + 1]; diff -puN drivers/usb/input/hid.h~git-input-fixup drivers/usb/input/hid.h --- a/drivers/usb/input/hid.h~git-input-fixup +++ a/drivers/usb/input/hid.h @@ -260,11 +260,8 @@ struct hid_item { #define HID_QUIRK_POWERBOOK_HAS_FN 0x00001000 #define HID_QUIRK_POWERBOOK_FN_ON 0x00002000 #define HID_QUIRK_INVERT_HWHEEL 0x00004000 -<<<<<<< HEAD/drivers/usb/input/hid.h #define HID_QUIRK_POWERBOOK_ISO_KEYBOARD 0x00008000 -======= -#define HID_QUIRK_BAD_RELATIVE_KEYS 0x00008000 ->>>>>>> /drivers/usb/input/hid.h +#define HID_QUIRK_BAD_RELATIVE_KEYS 0x00010000 /* * This is the global environment of the parser. This information is _