diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2007-02-12 23:56:24 -0600 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2007-02-12 23:56:24 -0600 |
| commit | cbe56159a3e60624b5f44cf48b640fa470436e34 (patch) | |
| tree | f3dd43243be6e840dc2b0386e91c4146a4f51620 /arch/m68k/kernel/vmlinux-sun3.lds | |
| parent | 67c2b7d9d224232ee730b9c9444abed824b62e7a (diff) | |
| parent | 17e0e27020d028a790d97699aff85a43af5be472 (diff) | |
| download | op-kernel-dev-cbe56159a3e60624b5f44cf48b640fa470436e34.zip op-kernel-dev-cbe56159a3e60624b5f44cf48b640fa470436e34.tar.gz | |
Merge branch 'master' into 83xx
Diffstat (limited to 'arch/m68k/kernel/vmlinux-sun3.lds')
| -rw-r--r-- | arch/m68k/kernel/vmlinux-sun3.lds | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/m68k/kernel/vmlinux-sun3.lds b/arch/m68k/kernel/vmlinux-sun3.lds index 8c7eccb..2868e20 100644 --- a/arch/m68k/kernel/vmlinux-sun3.lds +++ b/arch/m68k/kernel/vmlinux-sun3.lds @@ -55,10 +55,12 @@ __init_begin = .; .con_initcall.init : { *(.con_initcall.init) } __con_initcall_end = .; SECURITY_INIT +#ifdef CONFIG_BLK_DEV_INITRD . = ALIGN(8192); __initramfs_start = .; .init.ramfs : { *(.init.ramfs) } __initramfs_end = .; +#endif . = ALIGN(8192); __init_end = .; .data.init.task : { *(.data.init_task) } |
