diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2006-03-20 17:53:56 +0100 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2006-03-20 17:53:56 +0100 |
| commit | 61c5504a0ed66c8b460f9a006eedaea2ee587e33 (patch) | |
| tree | 2cf21d235f17e80d47fdb4ee1248865be8196d4d /drivers/macintosh/via-pmu.c | |
| parent | Merge branch 'master' of git+ssh://galak@master.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | [PATCH] powerpc: Fix bug in bug fix for bug in lmb_alloc() (diff) | |
| download | linux-61c5504a0ed66c8b460f9a006eedaea2ee587e33.tar.xz linux-61c5504a0ed66c8b460f9a006eedaea2ee587e33.zip | |
Merge branch 'master'
Diffstat (limited to 'drivers/macintosh/via-pmu.c')
| -rw-r--r-- | drivers/macintosh/via-pmu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c index 6eb93e45fcd3..4a478eb0e27d 100644 --- a/drivers/macintosh/via-pmu.c +++ b/drivers/macintosh/via-pmu.c @@ -825,7 +825,7 @@ proc_get_info(char *page, char **start, off_t off, p += sprintf(p, "PMU driver version : %d\n", PMU_DRIVER_VERSION); p += sprintf(p, "PMU firmware version : %02x\n", pmu_version); p += sprintf(p, "AC Power : %d\n", - ((pmu_power_flags & PMU_PWR_AC_PRESENT) != 0)); + ((pmu_power_flags & PMU_PWR_AC_PRESENT) != 0) || pmu_battery_count == 0); p += sprintf(p, "Battery count : %d\n", pmu_battery_count); return p - page; |