Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

[cascardo/linux.git] / arch / frv / kernel / head.S

diff --git a/arch/frv/kernel/head.S b/arch/frv/kernel/head.S
index 47c990a..e9a8cc6 100644 (file)
--- a/arch/frv/kernel/head.S
+++ b/arch/frv/kernel/head.S
@@ -9,8 +9,10 @@
  * 2 of the License, or (at your option) any later version.
  */
 
+#include <linux/init.h>
 #include <linux/threads.h>
 #include <linux/linkage.h>
+#include <asm/thread_info.h>
 #include <asm/ptrace.h>
 #include <asm/page.h>
 #include <asm/spr-regs.h>
@@ -26,7 +28,7 @@
 #   command line string
 #
 ###############################################################################
-       .section        .text.head,"ax"
+       __HEAD
        .balign         4
 
        .globl          _boot, __head_reference
@@ -540,7 +542,7 @@ __head_end:
        .size           _boot, .-_boot
 
        # provide a point for GDB to place a break
-       .section        .text.start,"ax"
+       .section        .text..start,"ax"
        .globl          _start
        .balign         4
 _start: