diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2007-02-13 00:57:21 -0500 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2007-02-13 00:57:21 -0500 |
| commit | 54c66f6d781e03dc0b23956234963c4911e6d1c0 (patch) | |
| tree | 40619a66ae6d8703a57bf681d087ffeabbffd346 /arch/powerpc/kernel/vmlinux.lds.S | |
| parent | 8ce0a7df6e6117d8814e976d4b7ce6a6b2c9cf93 (diff) | |
| parent | 17e0e27020d028a790d97699aff85a43af5be472 (diff) | |
Merge branch 'master' into 85xx
Diffstat (limited to 'arch/powerpc/kernel/vmlinux.lds.S')
| -rw-r--r-- | arch/powerpc/kernel/vmlinux.lds.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S index 04b8e71bf5b0..7eefeb4a30e7 100644 --- a/arch/powerpc/kernel/vmlinux.lds.S +++ b/arch/powerpc/kernel/vmlinux.lds.S | |||
| @@ -131,14 +131,14 @@ SECTIONS | |||
| 131 | __stop___fw_ftr_fixup = .; | 131 | __stop___fw_ftr_fixup = .; |
| 132 | } | 132 | } |
| 133 | #endif | 133 | #endif |
| 134 | 134 | #ifdef CONFIG_BLK_DEV_INITRD | |
| 135 | . = ALIGN(PAGE_SIZE); | 135 | . = ALIGN(PAGE_SIZE); |
| 136 | .init.ramfs : { | 136 | .init.ramfs : { |
| 137 | __initramfs_start = .; | 137 | __initramfs_start = .; |
| 138 | *(.init.ramfs) | 138 | *(.init.ramfs) |
| 139 | __initramfs_end = .; | 139 | __initramfs_end = .; |
| 140 | } | 140 | } |
| 141 | 141 | #endif | |
| 142 | #ifdef CONFIG_PPC32 | 142 | #ifdef CONFIG_PPC32 |
| 143 | . = ALIGN(32); | 143 | . = ALIGN(32); |
| 144 | #else | 144 | #else |