diff options
| author | Mark Brown <broonie@sirena.org.uk> | 2013-06-14 17:42:49 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@sirena.org.uk> | 2013-06-14 17:42:49 +0100 |
| commit | c4d0a06860b8ade51836f07ae050245f9059c6d6 (patch) | |
| tree | 88931d8ccb3cc94bb2a895149ff18dfc448e3324 /drivers/power/power_supply_sysfs.c | |
| parent | ebb7c3b1a10a2cd3986f2db60612d2c6fbb915ab (diff) | |
| parent | 1f76bce8544acd38f7bb1e822540f8ca521e1b7f (diff) | |
Merge remote-tracking branch 'jstultz-android/linaro-fixes/experimental/android-3.9' into merge-androidlsk-android-2013.06
Conflicts:
arch/arm/common/Makefile
arch/arm/include/asm/irq.h
arch/arm/include/asm/smp.h
arch/arm/kernel/smp.c
Diffstat (limited to 'drivers/power/power_supply_sysfs.c')
| -rw-r--r-- | drivers/power/power_supply_sysfs.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c index 29178f78d73..5a5fef4447e 100644 --- a/drivers/power/power_supply_sysfs.c +++ b/drivers/power/power_supply_sysfs.c @@ -189,6 +189,10 @@ static struct device_attribute power_supply_attrs[] = { POWER_SUPPLY_ATTR(time_to_full_avg), POWER_SUPPLY_ATTR(type), POWER_SUPPLY_ATTR(scope), + /* Local extensions */ + POWER_SUPPLY_ATTR(usb_hc), + POWER_SUPPLY_ATTR(usb_otg), + POWER_SUPPLY_ATTR(charge_enabled), /* Properties of type `const char *' */ POWER_SUPPLY_ATTR(model_name), POWER_SUPPLY_ATTR(manufacturer), |