diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-06 03:04:32 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-06 03:04:32 -0500 |
| commit | d12418fdeafdc08dd5bbec89d3e07e47ee75da55 (patch) | |
| tree | ac94d5bf58360b89fc7439fb52182c17d0674b0a /include/linux/power_supply.h | |
| parent | c2d1cec1c77f7714672c1efeae075424c929e0d5 (diff) | |
| parent | 238c6d54830c624f34ac9cf123ac04aebfca5013 (diff) | |
Merge branch 'linus' into cpus4096
Diffstat (limited to 'include/linux/power_supply.h')
| -rw-r--r-- | include/linux/power_supply.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h index f9348cba6dc1..8ff25e0e7f7a 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h | |||
| @@ -45,6 +45,7 @@ enum { | |||
| 45 | POWER_SUPPLY_HEALTH_DEAD, | 45 | POWER_SUPPLY_HEALTH_DEAD, |
| 46 | POWER_SUPPLY_HEALTH_OVERVOLTAGE, | 46 | POWER_SUPPLY_HEALTH_OVERVOLTAGE, |
| 47 | POWER_SUPPLY_HEALTH_UNSPEC_FAILURE, | 47 | POWER_SUPPLY_HEALTH_UNSPEC_FAILURE, |
| 48 | POWER_SUPPLY_HEALTH_COLD, | ||
| 48 | }; | 49 | }; |
| 49 | 50 | ||
| 50 | enum { | 51 | enum { |