diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-06-12 22:18:59 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-06-12 22:18:59 +0200 |
| commit | a9dd3865dd1bd996a7e6af808645b7e566ced009 (patch) | |
| tree | 4a11fe3663f1e7c375bb8d33af85d8b1ad5e5ad5 /arch/arm/include | |
| parent | Merge branch 'devel-stable' into for-next (diff) | |
| parent | ARM: fix EFM32 build breakage caused by cpu_resume_arm (diff) | |
| download | linux-a9dd3865dd1bd996a7e6af808645b7e566ced009.tar.xz linux-a9dd3865dd1bd996a7e6af808645b7e566ced009.zip | |
Merge branch 'for-arm-soc' into for-next
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/suspend.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/include/asm/suspend.h b/arch/arm/include/asm/suspend.h index cd20029bcd94..6c7182f32cef 100644 --- a/arch/arm/include/asm/suspend.h +++ b/arch/arm/include/asm/suspend.h @@ -7,6 +7,7 @@ struct sleep_save_sp { }; extern void cpu_resume(void); +extern void cpu_resume_arm(void); extern int cpu_suspend(unsigned long, int (*)(unsigned long)); #endif |