From f24306a731e24dfbd56addd00007e95ee8f6728a Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Sun, 29 Oct 2006 11:21:51 +0100
Subject: [PATCH] --- yaml --- r: 40432 b: refs/heads/master c:
 5fdb51a10f3ab4320c3170b79d66ce34a6e65a67 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/m68k/kernel/vmlinux-std.lds  | 8 +-------
 trunk/arch/m68k/kernel/vmlinux-sun3.lds | 8 +-------
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index b7e5c7f5d4f6..84752d400cf2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d8334def5cf831d2ed438aae021696a2faa4ddd
+refs/heads/master: 5fdb51a10f3ab4320c3170b79d66ce34a6e65a67
diff --git a/trunk/arch/m68k/kernel/vmlinux-std.lds b/trunk/arch/m68k/kernel/vmlinux-std.lds
index 69d1d3d30c78..d2794452b195 100644
--- a/trunk/arch/m68k/kernel/vmlinux-std.lds
+++ b/trunk/arch/m68k/kernel/vmlinux-std.lds
@@ -54,13 +54,7 @@ SECTIONS
   __setup_end = .;
   __initcall_start = .;
   .initcall.init : {
-	*(.initcall1.init)
-	*(.initcall2.init)
-	*(.initcall3.init)
-	*(.initcall4.init)
-	*(.initcall5.init)
-	*(.initcall6.init)
-	*(.initcall7.init)
+	INITCALLS
   }
   __initcall_end = .;
   __con_initcall_start = .;
diff --git a/trunk/arch/m68k/kernel/vmlinux-sun3.lds b/trunk/arch/m68k/kernel/vmlinux-sun3.lds
index 65cc39c24185..2550b4ae2732 100644
--- a/trunk/arch/m68k/kernel/vmlinux-sun3.lds
+++ b/trunk/arch/m68k/kernel/vmlinux-sun3.lds
@@ -48,13 +48,7 @@ __init_begin = .;
 	__setup_end = .;
 	__initcall_start = .;
 	.initcall.init : {
-		*(.initcall1.init)
-		*(.initcall2.init)
-		*(.initcall3.init)
-		*(.initcall4.init)
-		*(.initcall5.init)
-		*(.initcall6.init)
-		*(.initcall7.init)
+		INITCALLS
 	}
 	__initcall_end = .;
 	__con_initcall_start = .;