Merge branch 'gfar' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into upstream

1 files changed, 2 insertions, 0 deletions

diff --git a/arch/avr32/kernel/vmlinux.lds.c b/arch/avr32/kernel/vmlinux.lds.c
index 5c4424e362b5..ef13b7c78935 100644
--- a/arch/avr32/kernel/vmlinux.lds.c
+++ b/arch/avr32/kernel/vmlinux.lds.c
@@ -46,10 +46,12 @@ SECTIONS
                 __security_initcall_start = .;
                         *(.security_initcall.init)
                 __security_initcall_end = .;
+#ifdef CONFIG_BLK_DEV_INITRD
                 . = ALIGN(32);
                 __initramfs_start = .;
                         *(.init.ramfs)
                 __initramfs_end = .;
+#endif
                 . = ALIGN(4096);
                 __init_end = .;
         }