summaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm
diff options
context:
space:
mode:
authorKevin Hilman2015-06-12 22:40:12 +0200
committerKevin Hilman2015-06-12 22:40:12 +0200
commite75ea4569d6d1d10935d74ff80bad52dc09bd062 (patch)
treebc5787cd5124233f6958ef3136b8a019e5c2ffd1 /arch/arm/include/asm
parentMerge tag 'imx-cleanup-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff)
parentARM: fix EFM32 build breakage caused by cpu_resume_arm (diff)
downloadkernel-qcow2-linux-e75ea4569d6d1d10935d74ff80bad52dc09bd062.tar.gz
kernel-qcow2-linux-e75ea4569d6d1d10935d74ff80bad52dc09bd062.tar.xz
kernel-qcow2-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/asm')
-rw-r--r--arch/arm/include/asm/suspend.h1
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