Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes

[linux-2.6-omap-h63xx.git] / arch / m68k / kernel / head.S

diff --git a/arch/m68k/kernel/head.S b/arch/m68k/kernel/head.S
index 70002c146eed19c0c5dd76c73092d6a56f11df25..f513f530de9132670946f0d96705d08ce9d0c58e 100644 (file)
--- a/arch/m68k/kernel/head.S
+++ b/arch/m68k/kernel/head.S
@@ -255,7 +255,6 @@
  * MAC_USE_SCC_B:      Use the SCC port B (printer) for serial debug (default).
  */
 
-#include <linux/config.h>
 #include <linux/linkage.h>
 #include <linux/init.h>
 #include <asm/bootinfo.h>
@@ -578,7 +577,7 @@ func_define putn,1
 #endif
 .endm
 
-.text
+.section ".text.head","ax"
 ENTRY(_stext)
 /*
  * Version numbers of the bootinfo interface
@@ -1435,7 +1434,7 @@ L(mmu_fixup_done):
 #endif
 
 #ifdef CONFIG_HP300
-       is_not_hp300(1f)
+       is_not_hp300(2f)
        /*
         * Fix up the iobase register to point to the new location of the LEDs.
         */
@@ -3196,7 +3195,7 @@ func_start        serial_putc,%d0/%d1/%a0/%a1
        jbra    L(serial_putc_done)
 3:
 #endif
-       
+
 L(serial_putc_done):
 func_return    serial_putc