From 899a257487d0fba553f139045c1859cfcb23921d Mon Sep 17 00:00:00 2001
From: "Robert P. J. Day" <rpjday@crashcourse.ca>
Date: Fri, 25 Jul 2008 01:45:30 -0700
Subject: [PATCH] --- yaml --- r: 105791 b: refs/heads/master c:
 cb345d7352aa9e692ef4b83c41d3e6e1cdb2f846 h: refs/heads/master i:   105789:
 330cf1b3f12d40166ecf6ecbf89e1d9d0807d758   105787:
 fad5b174318eeb26f87e29b7a6b461ccea1089c6   105783:
 e3e950ea64bc3471aa15066e335437431a944fec   105775:
 94bde15f73539f042fb68c7340b6e14981135740   105759:
 b3c42095ffca20dd390e951e47617d753711cf4d   105727:
 bd744c028a94e53ba633f5b274e7d1a79af5f0f9 v: v3

---
 [refs]                    |  2 +-
 trunk/init/do_mounts_rd.c | 12 ------------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 363d6ae548c1..3312f332dfb7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b39c08cb692cb8898c30e0d8187c7cbe27cc905c
+refs/heads/master: cb345d7352aa9e692ef4b83c41d3e6e1cdb2f846
diff --git a/trunk/init/do_mounts_rd.c b/trunk/init/do_mounts_rd.c
index 46dfd64ae8fb..470a328d1454 100644
--- a/trunk/init/do_mounts_rd.c
+++ b/trunk/init/do_mounts_rd.c
@@ -10,8 +10,6 @@
 
 #include "do_mounts.h"
 
-#define BUILD_CRAMDISK
-
 int __initdata rd_prompt = 1;/* 1 = prompt for RAM disk, 0 = don't prompt */
 
 static int __init prompt_ramdisk(char *str)
@@ -162,14 +160,8 @@ int __init rd_load_image(char *from)
 		goto done;
 
 	if (nblocks == 0) {
-#ifdef BUILD_CRAMDISK
 		if (crd_load(in_fd, out_fd) == 0)
 			goto successful_load;
-#else
-		printk(KERN_NOTICE
-		       "RAMDISK: Kernel does not support compressed "
-		       "RAM disk images\n");
-#endif
 		goto done;
 	}
 
@@ -267,8 +259,6 @@ int __init rd_load_disk(int n)
 	return rd_load_image("/dev/root");
 }
 
-#ifdef BUILD_CRAMDISK
-
 /*
  * gzip declarations
  */
@@ -425,5 +415,3 @@ static int __init crd_load(int in_fd, int out_fd)
 	kfree(window);
 	return result;
 }
-
-#endif  /* BUILD_CRAMDISK */