diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-05-16 17:27:49 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-05-16 17:27:49 +0200 |
| commit | 49a34fd5380d249ae8a2173399c62fc5a1fddd70 (patch) | |
| tree | f0247fb2116d2775c01a8a5a316195df696b7c3e /arch/arm/mach-omap2/common.h | |
| parent | Linux 3.10-rc1 (diff) | |
| parent | ARM: OMAP4+: PM: Consolidate OMAP4 PM code to re-use it for OMAP5 (diff) | |
| download | linux-49a34fd5380d249ae8a2173399c62fc5a1fddd70.tar.xz linux-49a34fd5380d249ae8a2173399c62fc5a1fddd70.zip | |
Merge tag 'omap-pm-v3.10/cleanup/pm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-v3.11/pm
OMAP PM cleanups for v3.10
Diffstat (limited to 'arch/arm/mach-omap2/common.h')
| -rw-r--r-- | arch/arm/mach-omap2/common.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h index d555cf2459e1..7d95bb053b93 100644 --- a/arch/arm/mach-omap2/common.h +++ b/arch/arm/mach-omap2/common.h @@ -237,8 +237,8 @@ extern void omap_do_wfi(void); #ifdef CONFIG_SMP /* Needed for secondary core boot */ -extern void omap_secondary_startup(void); -extern void omap_secondary_startup_4460(void); +extern void omap4_secondary_startup(void); +extern void omap4460_secondary_startup(void); extern u32 omap_modify_auxcoreboot0(u32 set_mask, u32 clear_mask); extern void omap_auxcoreboot_addr(u32 cpu_addr); extern u32 omap_read_auxcoreboot0(void); |