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 b2e472c3e595b6bddddf76ada68582cf369b1ca0..5be325d890d96f9d823753e92296c379e3751076 100644 (file)
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -268,6 +268,8 @@ struct hid_item {
 #define HID_CP_APPLICATIONLAUNCHBUTTONS        0x000c0180
 #define HID_CP_GENERICGUIAPPLICATIONCONTROLS   0x000c0200
 
+#define HID_DG_DEVICECONFIG    0x000d000e
+#define HID_DG_DEVICESETTINGS  0x000d0023
 #define HID_DG_CONFIDENCE      0x000d0047
 #define HID_DG_WIDTH           0x000d0048
 #define HID_DG_HEIGHT          0x000d0049
@@ -541,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 */