diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-11-19 21:32:12 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-11-19 21:32:12 +1100 |
| commit | b10778a00d40b3d9fdaaf5891e802794781ff71c (patch) | |
| tree | 6ba4cbac86eecedc3f30650e7f764ecf00c83898 /drivers/power/power_supply_core.c | |
| parent | 594081ee7145cc30a3977cb4e218f81213b63dc5 (diff) | |
| parent | bfe01a5ba2490f299e1d2d5508cbbbadd897bbe9 (diff) | |
Merge commit 'v3.17' into next
Diffstat (limited to 'drivers/power/power_supply_core.c')
| -rw-r--r-- | drivers/power/power_supply_core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c index 5a5a24e7d43..078afd61490 100644 --- a/drivers/power/power_supply_core.c +++ b/drivers/power/power_supply_core.c @@ -537,7 +537,8 @@ static void psy_unregister_cooler(struct power_supply *psy) } #endif -int __power_supply_register(struct device *parent, struct power_supply *psy, bool ws) +static int __power_supply_register(struct device *parent, + struct power_supply *psy, bool ws) { struct device *dev; int rc; |