From 191a8d692d44a0a4d8cd207ae203c8f8146d4be0 Mon Sep 17 00:00:00 2001
From: "Robert P. J. Day" <rpjday@crashcourse.ca>
Date: Wed, 6 Feb 2008 01:37:25 -0800
Subject: [PATCH] --- yaml --- r: 83441 b: refs/heads/master c:
 b25b7819e51f388f8c8d7ae4679a658895dc67cc h: refs/heads/master i:   83439:
 891af3214d7bc6a190f1d69be4edc348ae247938 v: v3

---
 [refs]                 | 2 +-
 trunk/init/initramfs.c | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 5fa8050b42f5..35a6eff94c3b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d99c4f6b13b3149bc83703ab1493beaeaaaf8a2d
+refs/heads/master: b25b7819e51f388f8c8d7ae4679a658895dc67cc
diff --git a/trunk/init/initramfs.c b/trunk/init/initramfs.c
index 1db02a0025db..d53fee8d8604 100644
--- a/trunk/init/initramfs.c
+++ b/trunk/init/initramfs.c
@@ -503,7 +503,6 @@ static int __init retain_initrd_param(char *str)
 __setup("retain_initrd", retain_initrd_param);
 
 extern char __initramfs_start[], __initramfs_end[];
-#ifdef CONFIG_BLK_DEV_INITRD
 #include <linux/initrd.h>
 #include <linux/kexec.h>
 
@@ -539,15 +538,12 @@ static void __init free_initrd(void)
 	initrd_end = 0;
 }
 
-#endif
-
 static int __init populate_rootfs(void)
 {
 	char *err = unpack_to_rootfs(__initramfs_start,
 			 __initramfs_end - __initramfs_start, 0);
 	if (err)
 		panic(err);
-#ifdef CONFIG_BLK_DEV_INITRD
 	if (initrd_start) {
 #ifdef CONFIG_BLK_DEV_RAM
 		int fd;
@@ -579,7 +575,6 @@ static int __init populate_rootfs(void)
 		free_initrd();
 #endif
 	}
-#endif
 	return 0;
 }
 rootfs_initcall(populate_rootfs);