diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-02-20 14:13:30 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-02-20 14:13:30 -0500 |
| commit | 5a84d159061d914c8dd4aa372ac6e9529c2be453 (patch) | |
| tree | 9b08af78085334af44414adafe0096276f8fe0ff /arch/m68k/kernel/vmlinux-std.lds | |
| parent | e80a0e6e7ccdf64575d4384cb4172860422f5b81 (diff) | |
| parent | 7d477a04a619e90ee08724e8f2d8803c6bdfcef8 (diff) | |
Merge ARM fixes
Diffstat (limited to 'arch/m68k/kernel/vmlinux-std.lds')
| -rw-r--r-- | arch/m68k/kernel/vmlinux-std.lds | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/m68k/kernel/vmlinux-std.lds b/arch/m68k/kernel/vmlinux-std.lds index d2794452b195..437b4f8d86c5 100644 --- a/arch/m68k/kernel/vmlinux-std.lds +++ b/arch/m68k/kernel/vmlinux-std.lds | |||
| @@ -61,10 +61,12 @@ SECTIONS | |||
| 61 | .con_initcall.init : { *(.con_initcall.init) } | 61 | .con_initcall.init : { *(.con_initcall.init) } |
| 62 | __con_initcall_end = .; | 62 | __con_initcall_end = .; |
| 63 | SECURITY_INIT | 63 | SECURITY_INIT |
| 64 | #ifdef CONFIG_BLK_DEV_INITRD | ||
| 64 | . = ALIGN(8192); | 65 | . = ALIGN(8192); |
| 65 | __initramfs_start = .; | 66 | __initramfs_start = .; |
| 66 | .init.ramfs : { *(.init.ramfs) } | 67 | .init.ramfs : { *(.init.ramfs) } |
| 67 | __initramfs_end = .; | 68 | __initramfs_end = .; |
| 69 | #endif | ||
| 68 | . = ALIGN(8192); | 70 | . = ALIGN(8192); |
| 69 | __init_end = .; | 71 | __init_end = .; |
| 70 | 72 | ||