Skip to content

Commit

Permalink
init/: delete hard-coded setting and testing of BUILD_CRAMDISK
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
rpjday authored and torvalds committed Jul 25, 2008
1 parent b39c08c commit cb345d7
Showing 1 changed file with 0 additions and 12 deletions.
12 changes: 0 additions & 12 deletions init/do_mounts_rd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -267,8 +259,6 @@ int __init rd_load_disk(int n)
return rd_load_image("/dev/root");
}

#ifdef BUILD_CRAMDISK

/*
* gzip declarations
*/
Expand Down Expand Up @@ -425,5 +415,3 @@ static int __init crd_load(int in_fd, int out_fd)
kfree(window);
return result;
}

#endif /* BUILD_CRAMDISK */

0 comments on commit cb345d7

Please sign in to comment.