diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 17:34:16 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 17:34:16 +0000 |
commit | 4567c4a89693416ccca02d32109bce967e9c1ade (patch) | |
tree | 9d77cf02ce269ed5fc4b6e2ebddb9ad7fd504ad1 /arch/arm/mach-pxa/sharpsl.h | |
parent | 602fd7c36728a04e61a442c9755e7d454501266c (diff) | |
parent | 19d6c13b56a78b3757e747f469285c2a546d634a (diff) |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
Diffstat (limited to 'arch/arm/mach-pxa/sharpsl.h')
-rw-r--r-- | arch/arm/mach-pxa/sharpsl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/sharpsl.h b/arch/arm/mach-pxa/sharpsl.h index 55259f4756c..1439785d397 100644 --- a/arch/arm/mach-pxa/sharpsl.h +++ b/arch/arm/mach-pxa/sharpsl.h @@ -42,8 +42,8 @@ void corgi_lcdtg_hw_init(int mode); #define MAX1111_BATT_TEMP 2u #define MAX1111_ACIN_VOLT 6u -extern struct battery_thresh spitz_battery_levels_acin[]; -extern struct battery_thresh spitz_battery_levels_noac[]; +extern struct battery_thresh sharpsl_battery_levels_acin[]; +extern struct battery_thresh sharpsl_battery_levels_noac[]; int sharpsl_pm_pxa_read_max1111(int channel); |