diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /arch/arm/mach-pxa/include/mach/palmtx.h | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'arch/arm/mach-pxa/include/mach/palmtx.h')
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/palmtx.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/include/mach/palmtx.h b/arch/arm/mach-pxa/include/mach/palmtx.h index 1be0db6ed55e..10abc4f2e8e4 100644 --- a/arch/arm/mach-pxa/include/mach/palmtx.h +++ b/arch/arm/mach-pxa/include/mach/palmtx.h | |||
| @@ -94,7 +94,7 @@ | |||
| 94 | /* BATTERY */ | 94 | /* BATTERY */ |
| 95 | #define PALMTX_BAT_MAX_VOLTAGE 4000 /* 4.00v current voltage */ | 95 | #define PALMTX_BAT_MAX_VOLTAGE 4000 /* 4.00v current voltage */ |
| 96 | #define PALMTX_BAT_MIN_VOLTAGE 3550 /* 3.55v critical voltage */ | 96 | #define PALMTX_BAT_MIN_VOLTAGE 3550 /* 3.55v critical voltage */ |
| 97 | #define PALMTX_BAT_MAX_CURRENT 0 /* unknokn */ | 97 | #define PALMTX_BAT_MAX_CURRENT 0 /* unknown */ |
| 98 | #define PALMTX_BAT_MIN_CURRENT 0 /* unknown */ | 98 | #define PALMTX_BAT_MIN_CURRENT 0 /* unknown */ |
| 99 | #define PALMTX_BAT_MAX_CHARGE 1 /* unknown */ | 99 | #define PALMTX_BAT_MAX_CHARGE 1 /* unknown */ |
| 100 | #define PALMTX_BAT_MIN_CHARGE 1 /* unknown */ | 100 | #define PALMTX_BAT_MIN_CHARGE 1 /* unknown */ |