diff options
| author | Olof Johansson <olof@lixom.net> | 2014-03-08 22:11:16 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-03-08 22:11:16 -0800 |
| commit | 4058f76247b29978352339fb6278bed796dd210f (patch) | |
| tree | 9e1ed94202374acbd32dc5dd7b1162ea198c6b0f /drivers/acpi/battery.c | |
| parent | 614cd4a4ac3daf725508e372bce2160e2d8039a9 (diff) | |
| parent | 735ea23c4868bf3123a4c79184e9206e0cc60211 (diff) | |
| download | blackbird-op-linux-4058f76247b29978352339fb6278bed796dd210f.tar.gz blackbird-op-linux-4058f76247b29978352339fb6278bed796dd210f.zip | |
Merge tag 'bcm-for-3.14-pinctrl-reduced-rename' of git://github.com/broadcom/bcm11351 into fixes
Merge 'bcm pinctrl rename' From Christin Daudt:
Rename pinctrl dt binding to restore consistency with other bcm mobile
bindings.
* tag 'bcm-for-3.14-pinctrl-reduced-rename' of git://github.com/broadcom/bcm11351:
pinctrl: Rename Broadcom Capri pinctrl binding
pinctrl: refer to updated dt binding string.
Update dtsi with new pinctrl compatible string
+ Linux 3.14-rc4
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/acpi/battery.c')
| -rw-r--r-- | drivers/acpi/battery.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index 018a42883706..797a6938d051 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c @@ -841,6 +841,8 @@ static int acpi_battery_resume(struct device *dev) acpi_battery_update(battery); return 0; } +#else +#define acpi_battery_resume NULL #endif static SIMPLE_DEV_PM_OPS(acpi_battery_pm, NULL, acpi_battery_resume); |
