diff options
author | Kevin Hilman <khilman@linaro.org> | 2015-06-12 13:40:12 -0700 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2015-06-12 13:40:12 -0700 |
commit | e75ea4569d6d1d10935d74ff80bad52dc09bd062 (patch) | |
tree | bc5787cd5124233f6958ef3136b8a019e5c2ffd1 /arch/arm/mach-tegra/reset.h | |
parent | 7b38951b4e1315d3427b78f2095ced8ed9dbdfda (diff) | |
parent | 2678bb9fa137726a0b83dd61a9c1636543066755 (diff) |
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/mach-tegra/reset.h')
-rw-r--r-- | arch/arm/mach-tegra/reset.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/reset.h b/arch/arm/mach-tegra/reset.h index 76a93434c6ee..0aee0129f8d7 100644 --- a/arch/arm/mach-tegra/reset.h +++ b/arch/arm/mach-tegra/reset.h @@ -36,7 +36,6 @@ extern unsigned long __tegra_cpu_reset_handler_data[TEGRA_RESET_DATA_SIZE]; void __tegra_cpu_reset_handler_start(void); void __tegra_cpu_reset_handler(void); void __tegra_cpu_reset_handler_end(void); -void tegra_secondary_startup(void); #ifdef CONFIG_PM_SLEEP #define tegra_cpu_lp1_mask \ |