diff options
author | Robert P. J. Day <rpjday@crashcourse.ca> | 2008-07-25 04:45:30 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-25 13:53:27 -0400 |
commit | cb345d7352aa9e692ef4b83c41d3e6e1cdb2f846 (patch) | |
tree | 19b6d808a33b72c02abdf814bd4c8443b94c9b86 | |
parent | b39c08cb692cb8898c30e0d8187c7cbe27cc905c (diff) |
init/: delete hard-coded setting and testing of BUILD_CRAMDISK
There seems to be little point in explicitly setting, then testing the macro
BUILD_CRAMDISK within the context of a single source file.
Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | init/do_mounts_rd.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/init/do_mounts_rd.c b/init/do_mounts_rd.c index 46dfd64ae8fb..470a328d1454 100644 --- a/init/do_mounts_rd.c +++ b/init/do_mounts_rd.c | |||
@@ -10,8 +10,6 @@ | |||
10 | 10 | ||
11 | #include "do_mounts.h" | 11 | #include "do_mounts.h" |
12 | 12 | ||
13 | #define BUILD_CRAMDISK | ||
14 | |||
15 | int __initdata rd_prompt = 1;/* 1 = prompt for RAM disk, 0 = don't prompt */ | 13 | int __initdata rd_prompt = 1;/* 1 = prompt for RAM disk, 0 = don't prompt */ |
16 | 14 | ||
17 | static int __init prompt_ramdisk(char *str) | 15 | static int __init prompt_ramdisk(char *str) |
@@ -162,14 +160,8 @@ int __init rd_load_image(char *from) | |||
162 | goto done; | 160 | goto done; |
163 | 161 | ||
164 | if (nblocks == 0) { | 162 | if (nblocks == 0) { |
165 | #ifdef BUILD_CRAMDISK | ||
166 | if (crd_load(in_fd, out_fd) == 0) | 163 | if (crd_load(in_fd, out_fd) == 0) |
167 | goto successful_load; | 164 | goto successful_load; |
168 | #else | ||
169 | printk(KERN_NOTICE | ||
170 | "RAMDISK: Kernel does not support compressed " | ||
171 | "RAM disk images\n"); | ||
172 | #endif | ||
173 | goto done; | 165 | goto done; |
174 | } | 166 | } |
175 | 167 | ||
@@ -267,8 +259,6 @@ int __init rd_load_disk(int n) | |||
267 | return rd_load_image("/dev/root"); | 259 | return rd_load_image("/dev/root"); |
268 | } | 260 | } |
269 | 261 | ||
270 | #ifdef BUILD_CRAMDISK | ||
271 | |||
272 | /* | 262 | /* |
273 | * gzip declarations | 263 | * gzip declarations |
274 | */ | 264 | */ |
@@ -425,5 +415,3 @@ static int __init crd_load(int in_fd, int out_fd) | |||
425 | kfree(window); | 415 | kfree(window); |
426 | return result; | 416 | return result; |
427 | } | 417 | } |
428 | |||
429 | #endif /* BUILD_CRAMDISK */ | ||