diff options
| author | Robert P. J. Day <rpjday@crashcourse.ca> | 2008-07-25 01:45:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-25 10:53:27 -0700 |
| commit | cb345d7352aa9e692ef4b83c41d3e6e1cdb2f846 (patch) | |
| tree | 19b6d808a33b72c02abdf814bd4c8443b94c9b86 /init/do_mounts_rd.c | |
| parent | b39c08cb692cb8898c30e0d8187c7cbe27cc905c (diff) | |
| download | op-kernel-dev-cb345d7352aa9e692ef4b83c41d3e6e1cdb2f846.zip op-kernel-dev-cb345d7352aa9e692ef4b83c41d3e6e1cdb2f846.tar.gz | |
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>
Diffstat (limited to 'init/do_mounts_rd.c')
| -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 46dfd64..470a328 100644 --- a/init/do_mounts_rd.c +++ b/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 */ |
