Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

[linux-2.6.git] / arch / m68knommu / platform / 68328 / head-pilot.S

diff --git a/arch/m68knommu/platform/68328/head-pilot.S b/arch/m68knommu/platform/68328/head-pilot.S
index c46775f..9e07faa 100644 (file)
--- a/arch/m68knommu/platform/68328/head-pilot.S
+++ b/arch/m68knommu/platform/68328/head-pilot.S
@@ -15,13 +15,11 @@
 #define IMMED #
 #define        DBG_PUTC(x)     moveb IMMED x, 0xfffff907
 
-#include <linux/config.h>
 
 .global _stext
 .global _start
 
 .global _rambase
-.global __ramvec
 .global _ramvec
 .global _ramstart
 .global _ramend
@@ -121,7 +119,7 @@ L0:
        DBG_PUTC('B')
 
        /* Copy command line from beginning of RAM (+16) to end of bss */
-       movel   #__ramvec, %d7
+       movel   #CONFIG_VECTORBASE, %d7
        addl    #16, %d7
        moveal  %d7, %a0
        moveal  #_ebss, %a1