diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-07-20 19:08:17 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-07-20 19:08:17 +0200 |
| commit | c57d5621d2f2dc238f4b9c4d00b2a54187a75445 (patch) | |
| tree | ece13738a44545fb110e5d73adbf2625bc7a1ea6 /drivers/hid/hid-wiimote.h | |
| parent | Input: elan_i2c - enable ELAN0600 acpi panels (diff) | |
| parent | Linux 4.2-rc3 (diff) | |
| download | linux-c57d5621d2f2dc238f4b9c4d00b2a54187a75445.tar.xz linux-c57d5621d2f2dc238f4b9c4d00b2a54187a75445.zip | |
Merge tag 'v4.2-rc3' into next
Sync up with Linux 4.2-rc3 to bring in infrastructure (OF) pieces.
Diffstat (limited to 'drivers/hid/hid-wiimote.h')
| -rw-r--r-- | drivers/hid/hid-wiimote.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/hid/hid-wiimote.h b/drivers/hid/hid-wiimote.h index 10934aa129fb..875694d43e4d 100644 --- a/drivers/hid/hid-wiimote.h +++ b/drivers/hid/hid-wiimote.h @@ -147,7 +147,8 @@ struct wiimote_data { struct led_classdev *leds[4]; struct input_dev *accel; struct input_dev *ir; - struct power_supply battery; + struct power_supply *battery; + struct power_supply_desc battery_desc; struct input_dev *mp; struct timer_list timer; struct wiimote_debug *debug; |