Merge tag 'v3.9-rc3' into v4l_for_linus

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / power / power_supply_sysfs.c

diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
index 40fa3b7cae548033d0d69e358574326e11a8f22c..29178f78d73cfb79868923bfee7ffbe30b393e1b 100644 (file)
--- a/drivers/power/power_supply_sysfs.c
+++ b/drivers/power/power_supply_sysfs.c
@@ -55,7 +55,8 @@ static ssize_t power_supply_show_property(struct device *dev,
        };
        static char *health_text[] = {
                "Unknown", "Good", "Overheat", "Dead", "Over voltage",
-               "Unspecified failure", "Cold",
+               "Unspecified failure", "Cold", "Watchdog timer expire",
+               "Safety timer expire"
        };
        static char *technology_text[] = {
                "Unknown", "NiMH", "Li-ion", "Li-poly", "LiFe", "NiCd",