Merge branches 'for-4.11/upstream-fixes', 'for-4.12/accutouch', 'for-4.12/cp2112...

[mirror_ubuntu-artful-kernel.git] / include / linux / hid.h

diff --git a/include/linux/hid.h b/include/linux/hid.h
index 536f11fd21d5122a3ca0d917e947132854fd11fb..5be325d890d96f9d823753e92296c379e3751076 100644 (file)
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -324,7 +324,7 @@ struct hid_item {
 #define HID_QUIRK_MULTI_INPUT                  0x00000040
 #define HID_QUIRK_HIDINPUT_FORCE               0x00000080
 #define HID_QUIRK_NO_EMPTY_INPUT               0x00000100
-#define HID_QUIRK_NO_INIT_INPUT_REPORTS                0x00000200
+/* 0x00000200 reserved for backward compatibility, was NO_INIT_INPUT_REPORTS */
 #define HID_QUIRK_ALWAYS_POLL                  0x00000400
 #define HID_QUIRK_SKIP_OUTPUT_REPORTS          0x00010000
 #define HID_QUIRK_SKIP_OUTPUT_REPORT_ID                0x00020000
@@ -543,7 +543,6 @@ struct hid_device {                                                 /* device report descriptor */
        struct list_head inputs;                                        /* The list of inputs */
        void *hiddev;                                                   /* The hiddev structure */
        void *hidraw;
-       int minor;                                                      /* Hiddev minor number */
 
        int open;                                                       /* is the device open by anyone? */
        char name[128];                                                 /* Device name */