diff options
| author | Len Brown <len.brown@intel.com> | 2007-12-13 22:16:14 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-12-13 22:16:14 -0500 |
| commit | d020c36685a35f66be89700e911c7d77a67bdc43 (patch) | |
| tree | 86c03cd323fefe5b3aa06939a05de82f2f19b1a3 /drivers/acpi | |
| parent | 6790acb14d264d874ff8cbae1a72e72883ec3678 (diff) | |
| parent | ad40e68bf5c54831cd6b2199fd24d616bac179f7 (diff) | |
Pull battery-2.6.24 into release branch
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/battery.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index 7d6be23eff89..8f7505d304b5 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c | |||
| @@ -125,7 +125,7 @@ static int acpi_battery_technology(struct acpi_battery *battery) | |||
| 125 | return POWER_SUPPLY_TECHNOLOGY_NiMH; | 125 | return POWER_SUPPLY_TECHNOLOGY_NiMH; |
| 126 | if (!strcasecmp("LION", battery->type)) | 126 | if (!strcasecmp("LION", battery->type)) |
| 127 | return POWER_SUPPLY_TECHNOLOGY_LION; | 127 | return POWER_SUPPLY_TECHNOLOGY_LION; |
| 128 | if (!strcasecmp("LI-ION", battery->type)) | 128 | if (!strncasecmp("LI-ION", battery->type, 6)) |
| 129 | return POWER_SUPPLY_TECHNOLOGY_LION; | 129 | return POWER_SUPPLY_TECHNOLOGY_LION; |
| 130 | if (!strcasecmp("LiP", battery->type)) | 130 | if (!strcasecmp("LiP", battery->type)) |
| 131 | return POWER_SUPPLY_TECHNOLOGY_LIPO; | 131 | return POWER_SUPPLY_TECHNOLOGY_LIPO; |