From 1d4485a7beeeed8e9083acfaaa29840e6efa09cf Mon Sep 17 00:00:00 2001 From: Todd Poynor Date: Wed, 18 Jul 2012 16:28:50 -0700 Subject: [PATCH] ANDROID: GKI: power: power_supply: add POWER_SUPPLY_PROP_CHARGE_ENABLED Signed-off-by: Todd Poynor (cherry picked from commit 10152c2650a07958ea85add4cab67ccc808b4e02) Signed-off-by: Mark Salyzyn Bug: 150789066 Change-Id: I3e93b502452811cbfc4d904202b4f1d94edc143d --- drivers/power/supply/power_supply_sysfs.c | 1 + include/linux/power_supply.h | 1 + 2 files changed, 2 insertions(+) diff --git a/drivers/power/supply/power_supply_sysfs.c b/drivers/power/supply/power_supply_sysfs.c index 325271b01654..40fc8a479803 100644 --- a/drivers/power/supply/power_supply_sysfs.c +++ b/drivers/power/supply/power_supply_sysfs.c @@ -306,6 +306,7 @@ static struct device_attribute power_supply_attrs[] = { /* 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), diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h index 714c245c0346..3ac0232ce39c 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h @@ -153,6 +153,7 @@ enum power_supply_property { /* Local extensions */ POWER_SUPPLY_PROP_USB_HC, POWER_SUPPLY_PROP_USB_OTG, + POWER_SUPPLY_PROP_CHARGE_ENABLED, /* Properties of type `const char *' */ POWER_SUPPLY_PROP_MODEL_NAME, POWER_SUPPLY_PROP_MANUFACTURER,