Merge branches 'for-4.8/upstream-fixes', 'for-4.9/alps', 'for-4.9/hid-input', 'for...

[cascardo/linux.git] / drivers / hid / wacom.h

diff --git a/drivers/hid/wacom.h b/drivers/hid/wacom.h
index 8f8a162..b4800ea 100644 (file)
--- a/drivers/hid/wacom.h
+++ b/drivers/hid/wacom.h
@@ -134,12 +134,10 @@ struct wacom_group_leds {
 };
 
 struct wacom_battery {
+       struct wacom *wacom;
        struct power_supply_desc bat_desc;
-       struct power_supply_desc ac_desc;
        struct power_supply *battery;
-       struct power_supply *ac;
        char bat_name[WACOM_NAME_MAX];
-       char ac_name[WACOM_NAME_MAX];
        int battery_capacity;
        int bat_charging;
        int bat_connected;