diff options
author | David Woodhouse <dwmw2@infradead.org> | 2006-12-01 04:56:43 -0500 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2006-12-01 04:56:43 -0500 |
commit | bd3c97a7c718bfb9f1e4f31c16c383a5c6f815eb (patch) | |
tree | 3f56594e813c6f35cbacbdb3e137ba5bfd0b3069 /arch/ppc/kernel/vmlinux.lds.S | |
parent | 6c33cafc794d07c9254c160789120a0e98c088c9 (diff) | |
parent | 0215ffb08ce99e2bb59eca114a99499a4d06e704 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/ppc/kernel/vmlinux.lds.S')
-rw-r--r-- | arch/ppc/kernel/vmlinux.lds.S | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/ppc/kernel/vmlinux.lds.S b/arch/ppc/kernel/vmlinux.lds.S index 095fd3323323..16e8661e1fec 100644 --- a/arch/ppc/kernel/vmlinux.lds.S +++ b/arch/ppc/kernel/vmlinux.lds.S | |||
@@ -115,13 +115,7 @@ SECTIONS | |||
115 | __setup_end = .; | 115 | __setup_end = .; |
116 | __initcall_start = .; | 116 | __initcall_start = .; |
117 | .initcall.init : { | 117 | .initcall.init : { |
118 | *(.initcall1.init) | 118 | INITCALLS |
119 | *(.initcall2.init) | ||
120 | *(.initcall3.init) | ||
121 | *(.initcall4.init) | ||
122 | *(.initcall5.init) | ||
123 | *(.initcall6.init) | ||
124 | *(.initcall7.init) | ||
125 | } | 119 | } |
126 | __initcall_end = .; | 120 | __initcall_end = .; |
127 | 121 | ||