aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-12-13 22:16:14 -0500
committerLen Brown <len.brown@intel.com>2007-12-13 22:16:14 -0500
commitd020c36685a35f66be89700e911c7d77a67bdc43 (patch)
tree86c03cd323fefe5b3aa06939a05de82f2f19b1a3 /drivers
parent6790acb14d264d874ff8cbae1a72e72883ec3678 (diff)
parentad40e68bf5c54831cd6b2199fd24d616bac179f7 (diff)
Pull battery-2.6.24 into release branch
Diffstat (limited to 'drivers')
-rw-r--r--drivers/acpi/battery.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 7d6be23eff8..8f7505d304b 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -125,7 +125,7 @@ static int acpi_battery_technology(struct acpi_battery *battery)
return POWER_SUPPLY_TECHNOLOGY_NiMH;
if (!strcasecmp("LION", battery->type))
return POWER_SUPPLY_TECHNOLOGY_LION;
- if (!strcasecmp("LI-ION", battery->type))
+ if (!strncasecmp("LI-ION", battery->type, 6))
return POWER_SUPPLY_TECHNOLOGY_LION;
if (!strcasecmp("LiP", battery->type))
return POWER_SUPPLY_TECHNOLOGY_LIPO;