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/m68k | |
| 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/m68k')
| -rw-r--r-- | arch/m68k/kernel/vmlinux-std.lds | 8 | ||||
| -rw-r--r-- | arch/m68k/kernel/vmlinux-sun3.lds | 8 |
2 files changed, 2 insertions, 14 deletions
diff --git a/arch/m68k/kernel/vmlinux-std.lds b/arch/m68k/kernel/vmlinux-std.lds index 69d1d3d30c78..d2794452b195 100644 --- a/arch/m68k/kernel/vmlinux-std.lds +++ b/arch/m68k/kernel/vmlinux-std.lds | |||
| @@ -54,13 +54,7 @@ SECTIONS | |||
| 54 | __setup_end = .; | 54 | __setup_end = .; |
| 55 | __initcall_start = .; | 55 | __initcall_start = .; |
| 56 | .initcall.init : { | 56 | .initcall.init : { |
| 57 | *(.initcall1.init) | 57 | INITCALLS |
| 58 | *(.initcall2.init) | ||
| 59 | *(.initcall3.init) | ||
| 60 | *(.initcall4.init) | ||
| 61 | *(.initcall5.init) | ||
| 62 | *(.initcall6.init) | ||
| 63 | *(.initcall7.init) | ||
| 64 | } | 58 | } |
| 65 | __initcall_end = .; | 59 | __initcall_end = .; |
| 66 | __con_initcall_start = .; | 60 | __con_initcall_start = .; |
diff --git a/arch/m68k/kernel/vmlinux-sun3.lds b/arch/m68k/kernel/vmlinux-sun3.lds index 65cc39c24185..2550b4ae2732 100644 --- a/arch/m68k/kernel/vmlinux-sun3.lds +++ b/arch/m68k/kernel/vmlinux-sun3.lds | |||
| @@ -48,13 +48,7 @@ __init_begin = .; | |||
| 48 | __setup_end = .; | 48 | __setup_end = .; |
| 49 | __initcall_start = .; | 49 | __initcall_start = .; |
| 50 | .initcall.init : { | 50 | .initcall.init : { |
| 51 | *(.initcall1.init) | 51 | INITCALLS |
| 52 | *(.initcall2.init) | ||
| 53 | *(.initcall3.init) | ||
| 54 | *(.initcall4.init) | ||
| 55 | *(.initcall5.init) | ||
| 56 | *(.initcall6.init) | ||
| 57 | *(.initcall7.init) | ||
| 58 | } | 52 | } |
| 59 | __initcall_end = .; | 53 | __initcall_end = .; |
| 60 | __con_initcall_start = .; | 54 | __con_initcall_start = .; |