Voyager setup_trampoline() compile error

Voyager setup_trampoline() compile error

[Adrian Bunk]

Commit 77ad386e596c6b0930cc2e09e3cce485e3ee7f72
(x86: standalone trampoline code) broke Voyager:

<--  snip  -->

...
  LD      vmlinux.o
arch/x86/mach-voyager/built-in.o:(.bss+0x50): multiple definition of `trampoline_base'
arch/x86/kernel/built-in.o:(.data+0x820): first defined here
arch/x86/mach-voyager/built-in.o: In function `setup_trampoline':
(.init.text+0x30e): multiple definition of `setup_trampoline'
arch/x86/kernel/built-in.o:(.text+0x57c8): first defined here
make[1]: *** [vmlinux.o] Error 1


cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed