Skip to content

Commit

Permalink
ARM: pxa: fix mixed declarations and code in sharpsl_pm
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Haojian Zhuang committed Feb 16, 2012
1 parent bc329ad commit 438d7dc
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions arch/arm/mach-pxa/sharpsl_pm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand All @@ -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.
*/
Expand Down

0 comments on commit 438d7dc

Please sign in to comment.