diff options
| author | Len Brown <len.brown@intel.com> | 2009-04-05 02:14:15 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-04-05 02:14:15 -0400 |
| commit | 478c6a43fcbc6c11609f8cee7c7b57223907754f (patch) | |
| tree | a7f7952099da60d33032aed6de9c0c56c9f8779e /drivers/power | |
| parent | 8a3f257c704e02aee9869decd069a806b45be3f1 (diff) | |
| parent | 6bb597507f9839b13498781e481f5458aea33620 (diff) | |
Merge branch 'linus' into release
Conflicts:
arch/x86/kernel/cpu/cpufreq/longhaul.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/bq27x00_battery.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c index 0c056fcc01c..62bb98124e2 100644 --- a/drivers/power/bq27x00_battery.c +++ b/drivers/power/bq27x00_battery.c | |||
| @@ -83,7 +83,7 @@ static int bq27x00_read(u8 reg, int *rt_value, int b_single, | |||
| 83 | } | 83 | } |
| 84 | 84 | ||
| 85 | /* | 85 | /* |
| 86 | * Return the battery temperature in Celcius degrees | 86 | * Return the battery temperature in Celsius degrees |
| 87 | * Or < 0 if something fails. | 87 | * Or < 0 if something fails. |
| 88 | */ | 88 | */ |
| 89 | static int bq27x00_battery_temperature(struct bq27x00_device_info *di) | 89 | static int bq27x00_battery_temperature(struct bq27x00_device_info *di) |