Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

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

diff --git a/drivers/hid/wacom.h b/drivers/hid/wacom.h
index 9159dd3..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;
@@ -216,4 +214,8 @@ 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);
+enum led_brightness wacom_leds_brightness_get(struct wacom_led *led);
+struct wacom_led *wacom_led_find(struct wacom *wacom, unsigned int group,
+                                unsigned int id);
+struct wacom_led *wacom_led_next(struct wacom *wacom, struct wacom_led *cur);
 #endif