2 files changed, 5 insertions, 1 deletions

diff --git a/arch/cris/arch-v10/vmlinux.lds.S b/arch/cris/arch-v10/vmlinux.lds.S
index 689729a7e66e..4b348b38cf33 100644
--- 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 = .;
diff --git a/arch/cris/arch-v32/vmlinux.lds.S b/arch/cris/arch-v32/vmlinux.lds.S
index 472d4b3c4cf4..e124fcd766d5 100644
--- a/arch/cris/arch-v32/vmlinux.lds.S
+++ b/arch/cris/arch-v32/vmlinux.lds.S
@@ -95,6 +95,7 @@ SECTIONS
         .data.percpu  : { *(.data.percpu) }
         __per_cpu_end = .;
 
+#ifdef CONFIG_BLK_DEV_INITRD
         .init.ramfs : {
                 __initramfs_start = .;
                 *(.init.ramfs)
@@ -107,6 +108,7 @@ SECTIONS
                 FILL (0);
                 . = ALIGN (8192);
         }
+#endif
 
         __vmlinux_end = .;      /* Last address of the physical file. */
         __init_end = .;