summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2004-02-20 17:11:23 -0800
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2004-02-20 17:11:23 -0800
commit45cf898bb4c8dad48c3cc5c10dc2506523901f46 (patch)
treea3198865acc34537ae736ace346fb208c1eb2338 /include
parente3475ce5c8dfed322d2a3065abf0b4af9d807692 (diff)
[PATCH] Remove use of "current" identifier in via-pmu
Andrew spotted this one, here's the fix: Remove usage of "current" as a variable name and structure member in the battery management code of PowerMac via-pmu and apm-emu drivers
Diffstat (limited to 'include')
-rw-r--r--include/linux/pmu.h2
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 */
};