diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-10-27 06:46:20 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-10-27 06:46:20 +0200 |
| commit | 6ad390a25a9d1d8606b9b826878f0a30639dc2b3 (patch) | |
| tree | 05aff14f02776bc0d59a1f777cb92df6f4456ba9 /drivers/power/apm_power.c | |
| parent | Input: wacom - revert "Cintiq 21UX2 does not have menu strips" (diff) | |
| parent | Input: adp5589-keys - add support for the ADP5585 derivatives (diff) | |
| download | linux-6ad390a25a9d1d8606b9b826878f0a30639dc2b3.tar.xz linux-6ad390a25a9d1d8606b9b826878f0a30639dc2b3.zip | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/power/apm_power.c')
| -rw-r--r-- | drivers/power/apm_power.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/power/apm_power.c b/drivers/power/apm_power.c index dc628cb2e762..8a612dec9139 100644 --- a/drivers/power/apm_power.c +++ b/drivers/power/apm_power.c @@ -14,11 +14,11 @@ #include <linux/apm-emulation.h> -#define PSY_PROP(psy, prop, val) psy->get_property(psy, \ - POWER_SUPPLY_PROP_##prop, val) +#define PSY_PROP(psy, prop, val) (psy->get_property(psy, \ + POWER_SUPPLY_PROP_##prop, val)) -#define _MPSY_PROP(prop, val) main_battery->get_property(main_battery, \ - prop, val) +#define _MPSY_PROP(prop, val) (main_battery->get_property(main_battery, \ + prop, val)) #define MPSY_PROP(prop, val) _MPSY_PROP(POWER_SUPPLY_PROP_##prop, val) |