summaryrefslogtreecommitdiff
path: root/arch/arm/mach-pxa/pm.h
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-01-29 15:06:30 +0100
committerRobert Jarzmik <robert.jarzmik@free.fr>2016-02-01 21:44:27 +0100
commita9a54caed96561d01f1d923df61bd11b71df4b93 (patch)
tree5c04a0bec4a25a704bcb171bd3e91fc2feffba85 /arch/arm/mach-pxa/pm.h
parent2f2028615924b953d9b00a06119c14c3dac9247e (diff)
ARM: pxa: move extern declarations to pm.h
When CONFIG_IWMMXT is disabled, we get a warning in pxa3xx.c: arch/arm/mach-pxa/pxa3xx.c: In function 'pxa3xx_cpu_pm_suspend': arch/arm/mach-pxa/pxa3xx.c:109:2: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement] It turns out that there is an 'extern' declaration in the middle of a function. For consistency, this moves the declaration and two others from the same file into pm.h. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Diffstat (limited to 'arch/arm/mach-pxa/pm.h')
-rw-r--r--arch/arm/mach-pxa/pm.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/pm.h b/arch/arm/mach-pxa/pm.h
index 51558bcee999..3aab90d8d2b7 100644
--- a/arch/arm/mach-pxa/pm.h
+++ b/arch/arm/mach-pxa/pm.h
@@ -29,6 +29,9 @@ extern int pxa_pm_enter(suspend_state_t state);
extern int pxa_pm_prepare(void);
extern void pxa_pm_finish(void);
+extern const char pm_enter_standby_start[], pm_enter_standby_end[];
+extern int pxa3xx_finish_suspend(unsigned long);
+
/* NOTE: this is for PM debugging on Lubbock, it's really a big
* ugly, but let's keep the crap minimum here, instead of direct
* accessing the LUBBOCK CPLD registers in arch/arm/mach-pxa/pm.c