diff options
| author | Ben Collins <bcollins@debian.org> | 2004-02-21 12:52:22 -0500 |
|---|---|---|
| committer | Ben Collins <bcollins@debian.org> | 2004-02-21 12:52:22 -0500 |
| commit | 2f7c0cc48267f947c7329d88be9c62bfce30b8b2 (patch) | |
| tree | e1e3d33a58edab6d16ae9e3c116fcd0ab3a0e0c9 /include/linux | |
| parent | fd35598a20a26a21b62298405c0df666d323150c (diff) | |
| parent | 699147963924c5747866e525848484a30c49d875 (diff) | |
Merge http://linux.bkbits.net/linux-2.5
into debian.org:/usr/src/kernel/ieee1394-2.6
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/pmu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/pmu.h b/include/linux/pmu.h index b97041287312..6d73eada277e 100644 --- a/include/linux/pmu.h +++ b/include/linux/pmu.h @@ -226,7 +226,7 @@ struct pmu_battery_info unsigned int flags; unsigned int charge; /* current charge */ unsigned int max_charge; /* maximum charge */ - signed int current; /* current, positive if charging */ + signed int amperage; /* current, positive if charging */ unsigned int voltage; /* voltage */ unsigned int time_remaining; /* remaining time */ }; |