Merge branch 'for-v4.1-rc1' of git://git.linaro.org/people/mszyprowski/linux-dma...

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

diff --git a/drivers/hid/wacom.h b/drivers/hid/wacom.h
index ad7318db1dfe9223c276b450f0f0a292edc82186..024f4d89d5792ae9a04739b5b895647177e6ecd4 100644 (file)
--- a/drivers/hid/wacom.h
+++ b/drivers/hid/wacom.h
@@ -119,8 +119,10 @@ struct wacom {
                u8 img_lum;   /* OLED matrix display brightness */
        } led;
        bool led_initialized;
-       struct power_supply battery;
-       struct power_supply ac;
+       struct power_supply *battery;
+       struct power_supply *ac;
+       struct power_supply_desc battery_desc;
+       struct power_supply_desc ac_desc;
 };
 
 static inline void wacom_schedule_work(struct wacom_wac *wacom_wac)