Merge tag 'for-linus-4.3-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / drivers / hid / wacom.h

diff --git a/drivers/hid/wacom.h b/drivers/hid/wacom.h
index a533787a6d857f815bcf816aefcde3c6d7ad7a4f..4681a65a4579cf1b9fbcae830f583e4e9c3d4d73 100644 (file)
--- a/drivers/hid/wacom.h
+++ b/drivers/hid/wacom.h
@@ -113,7 +113,7 @@ struct wacom {
        struct mutex lock;
        struct work_struct work;
        struct wacom_led {
-               u8 select[2]; /* status led selector (0..3) */
+               u8 select[5]; /* status led selector (0..3) */
                u8 llv;       /* status led brightness no button (1..127) */
                u8 hlv;       /* status led brightness button pressed (1..127) */
                u8 img_lum;   /* OLED matrix display brightness */
@@ -123,6 +123,8 @@ struct wacom {
        struct power_supply *ac;
        struct power_supply_desc battery_desc;
        struct power_supply_desc ac_desc;
+       struct kobject *remote_dir;
+       struct attribute_group remote_group[5];
 };
 
 static inline void wacom_schedule_work(struct wacom_wac *wacom_wac)
@@ -147,4 +149,7 @@ int wacom_wac_event(struct hid_device *hdev, struct hid_field *field,
                struct hid_usage *usage, __s32 value);
 void wacom_wac_report(struct hid_device *hdev, struct hid_report *report);
 void wacom_battery_work(struct work_struct *work);
+int wacom_remote_create_attr_group(struct wacom *wacom, __u32 serial,
+                                  int index);
+void wacom_remote_destroy_attr_group(struct wacom *wacom, __u32 serial);
 #endif