Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 105791
b: refs/heads/master
c: cb345d7
h: refs/heads/master
i:
  105789: 330cf1b
  105787: fad5b17
  105783: e3e950e
  105775: 94bde15
  105759: b3c4209
  105727: bd744c0
v: v3
  • Loading branch information
Robert P. J. Day authored and Linus Torvalds committed Jul 25, 2008
1 parent 67265f4 commit 899a257
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 13 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b39c08cb692cb8898c30e0d8187c7cbe27cc905c
refs/heads/master: cb345d7352aa9e692ef4b83c41d3e6e1cdb2f846
12 changes: 0 additions & 12 deletions trunk/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 899a257

Please sign in to comment.