git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of ssh://master.kernel.org/pub/scm/linux/kernel/git/ieee1394...
[pandora-kernel.git]
/
arch
/
alpha
/
kernel
/
vmlinux.lds.S
diff --git
a/arch/alpha/kernel/vmlinux.lds.S
b/arch/alpha/kernel/vmlinux.lds.S
index
76bf071
..
4cc44bd
100644
(file)
--- a/
arch/alpha/kernel/vmlinux.lds.S
+++ b/
arch/alpha/kernel/vmlinux.lds.S
@@
-52,10
+52,12
@@
SECTIONS
}
__initcall_end = .;
+#ifdef CONFIG_BLK_DEV_INITRD
. = ALIGN(8192);
__initramfs_start = .;
.init.ramfs : { *(.init.ramfs) }
__initramfs_end = .;
+#endif
. = ALIGN(8);
.con_initcall.init : {