diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-06-12 22:40:12 +0200 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-06-12 22:40:12 +0200 |
| commit | e75ea4569d6d1d10935d74ff80bad52dc09bd062 (patch) | |
| tree | bc5787cd5124233f6958ef3136b8a019e5c2ffd1 /arch/arm/include | |
| parent | Merge tag 'imx-cleanup-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | ARM: fix EFM32 build breakage caused by cpu_resume_arm (diff) | |
| download | linux-e75ea4569d6d1d10935d74ff80bad52dc09bd062.tar.xz linux-e75ea4569d6d1d10935d74ff80bad52dc09bd062.zip | |
Merge branch 'for-arm-soc' of http://ftp.arm.linux.org.uk/pub/armlinux/kernel/git-cur/linux-2.6-arm into next/cleanup
* 'for-arm-soc' of http://ftp.arm.linux.org.uk/pub/armlinux/kernel/git-cur/linux-2.6-arm:
ARM: fix EFM32 build breakage caused by cpu_resume_arm
ARM: 8389/1: Add cpu_resume_arm() for firmwares that resume in ARM state
ARM: v7 setup function should invalidate L1 cache
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 |