diff options
| author | Haojian Zhuang <haojian.zhuang@marvell.com> | 2012-02-06 15:59:11 +0800 |
|---|---|---|
| committer | Haojian Zhuang <haojian.zhuang@marvell.com> | 2012-02-16 10:29:07 +0800 |
| commit | 438d7dc2bb531de59e335fea69d4a041f353f6f9 (patch) | |
| tree | 9dd88dfcf3be56b7b9770d23103e947cd6c96d9e /arch | |
| parent | bc329ad7b018c8f6725cb025bf4d192925db84e6 (diff) | |
| download | op-kernel-dev-438d7dc2bb531de59e335fea69d4a041f353f6f9.zip op-kernel-dev-438d7dc2bb531de59e335fea69d4a041f353f6f9.tar.gz | |
ARM: pxa: fix mixed declarations and code in sharpsl_pm
arch/arm/mach-pxa/sharpsl_pm.c: In function
'sharpsl_pm_pxa_read_max1111':
arch/arm/mach-pxa/sharpsl_pm.c:180: warning: ISO C90 forbids mixed
declarations and code
Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-pxa/sharpsl_pm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c index 8d5168d..30989ba 100644 --- a/arch/arm/mach-pxa/sharpsl_pm.c +++ b/arch/arm/mach-pxa/sharpsl_pm.c @@ -168,6 +168,7 @@ struct battery_thresh sharpsl_battery_levels_noac[] = { #define MAXCTRL_SEL_SH 4 #define MAXCTRL_STR (1u << 7) +extern int max1111_read_channel(int); /* * Read MAX1111 ADC */ @@ -177,8 +178,6 @@ int sharpsl_pm_pxa_read_max1111(int channel) if (machine_is_tosa()) return 0; - extern int max1111_read_channel(int); - /* max1111 accepts channels from 0-3, however, * it is encoded from 0-7 here in the code. */ |
