projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://oss.sgi.com:8090/xfs/xfs-2.6
[linux-drm-fsl-dcu.git]
/
arch
/
cris
/
arch-v10
/
vmlinux.lds.S
diff --git
a/arch/cris/arch-v10/vmlinux.lds.S
b/arch/cris/arch-v10/vmlinux.lds.S
index 689729a7e66e6b217d8649a3f8ae6235f1b2798d..4b348b38cf333f9819776a817a4de43f618ded6d 100644
(file)
--- a/
arch/cris/arch-v10/vmlinux.lds.S
+++ b/
arch/cris/arch-v10/vmlinux.lds.S
@@
-82,7
+82,8
@@
SECTIONS
__con_initcall_end = .;
}
SECURITY_INIT
-
+
+#ifdef CONFIG_BLK_DEV_INITRD
.init.ramfs : {
__initramfs_start = .;
*(.init.ramfs)
@@
-93,6
+94,7
@@
SECTIONS
FILL (0);
. = ALIGN (8192);
}
+#endif
__vmlinux_end = .; /* last address of the physical file */
__init_end = .;