power: power_supply: add POWER_SUPPLY_PROP_CHARGE_ENABLED
Todd Poynor [Wed, 18 Jul 2012 23:28:50 +0000 (16:28 -0700)]
Change-Id: I3e93b502452811cbfc4d904202b4f1d94edc143d
Signed-off-by: Todd Poynor <toddpoynor@google.com>

drivers/power/power_supply_sysfs.c
include/linux/power_supply.h

index a5ef8c3..b20acfa 100644 (file)
@@ -177,6 +177,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),
index 00378a2..e1f5447 100644 (file)
@@ -127,6 +127,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,