fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / arch / sh64 / kernel / head.S

diff --git a/arch/sh64/kernel/head.S b/arch/sh64/kernel/head.S
index 667aef4..f3740dd 100644 (file)
--- a/arch/sh64/kernel/head.S
+++ b/arch/sh64/kernel/head.S
@@ -20,7 +20,6 @@
  *    Add early SCIF console DTLB mapping.
  */
 
-#include <linux/config.h>
 
 #include <asm/page.h>
 #include <asm/mmu_context.h>
@@ -96,8 +95,8 @@ empty_zero_page:
        .long   0               /* RAMDISK_FLAGS */
        .long   0x0200          /* ORIG_ROOT_DEV */
        .long   1               /* LOADER_TYPE */
-       .long   0x00360000      /* INITRD_START */
-       .long   0x000a0000      /* INITRD_SIZE */
+       .long   0x00800000      /* INITRD_START */
+       .long   0x00800000      /* INITRD_SIZE */
        .long   0
 
        .text
@@ -310,7 +309,7 @@ hyperspace:                     /* ... that's the next instruction !  */
         */
        movi fpu_in_use, r31    /* Temporary */
 
-#ifndef CONFIG_NOFPU_SUPPORT
+#ifdef CONFIG_SH_FPU
        getcon  SR, r21
        movi    SR_ENABLE_FPU, r22
        and     r21, r22, r22