diff options
| author | Len Brown <len.brown@intel.com> | 2008-02-09 09:32:47 (GMT) |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-02-09 09:32:47 (GMT) |
| commit | d47b180c26c22d78c2428117abb7e6beba00b7ef (patch) | |
| tree | a71fe62835a144a91d8b2ba10bd06ef42c804d06 /drivers/acpi/sbs.c | |
| parent | 249d621a85668b3b09296fbcfcf1cb5e9372a5ea (diff) | |
| parent | bbafbecb24190959d77a8fee7bd23798b81e25c2 (diff) | |
| download | linux-fsl-qoriq-d47b180c26c22d78c2428117abb7e6beba00b7ef.tar.xz | |
Merge branches 'release' and 'bugzilla-9910' into release
Diffstat (limited to 'drivers/acpi/sbs.c')
| -rw-r--r-- | drivers/acpi/sbs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c index 1194105..585ae3c 100644 --- a/drivers/acpi/sbs.c +++ b/drivers/acpi/sbs.c @@ -827,7 +827,7 @@ static int acpi_battery_add(struct acpi_sbs *sbs, int id) #endif printk(KERN_INFO PREFIX "%s [%s]: Battery Slot [%s] (battery %s)\n", ACPI_SBS_DEVICE_NAME, acpi_device_bid(sbs->device), - battery->name, sbs->battery->present ? "present" : "absent"); + battery->name, battery->present ? "present" : "absent"); return result; } |