From: Glauber Costa <gcosta@redhat.com>
Date: Mon, 3 Mar 2008 17:13:11 +0000 (-0300)
Subject: x86: adapt voyager's setup_trampoline
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=da522b07293756b9cb4e2c570454f95b8e79e189;p=linux-beck.git

x86: adapt voyager's setup_trampoline

make setup_trampoline non-static. This way, it won't conflict
with the extern declaration in smp.h

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/arch/x86/mach-voyager/voyager_smp.c b/arch/x86/mach-voyager/voyager_smp.c
index 20b7ce697ee8..11b806c7ed94 100644
--- a/arch/x86/mach-voyager/voyager_smp.c
+++ b/arch/x86/mach-voyager/voyager_smp.c
@@ -429,7 +429,7 @@ void __init smp_store_cpu_info(int id)
 }
 
 /* set up the trampoline and return the physical address of the code */
-static __u32 __init setup_trampoline(void)
+unsigned long __init setup_trampoline(void)
 {
 	/* these two are global symbols in trampoline.S */
 	extern const __u8 trampoline_end[];