---

yaml --- r: 273020 b: refs/heads/master c: 549e78d h: refs/heads/master v: v3
git-mirror · Nov 2, 2011 · 04a95a0 · 04a95a0
1 parent 9305134
commit 04a95a0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 15 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0acdbbeb6dd435f5f3f1648fc3a2ab5fd07b5545
+refs/heads/master: 549e78db9438374cb6a58201cc5f2194b222688f
diff --git a/trunk/arch/um/include/shared/initrd.h b/trunk/arch/um/include/shared/initrd.h
diff --git a/trunk/arch/um/kernel/initrd.c b/trunk/arch/um/kernel/initrd.c
@@ -7,12 +7,12 @@
 #include "linux/bootmem.h"
 #include "linux/initrd.h"
 #include "asm/types.h"
-#include "initrd.h"
 #include "init.h"
 #include "os.h"
 
 /* Changed by uml_initrd_setup, which is a setup */
 static char *initrd __initdata = NULL;
+static int load_initrd(char *filename, void *buf, int size);
 
 static int __init read_initrd(void)
 {
@@ -62,7 +62,7 @@ __uml_setup("initrd=", uml_initrd_setup,
 "    name of the file containing the image.\n\n"
 );
 
-int load_initrd(char *filename, void *buf, int size)
+static int load_initrd(char *filename, void *buf, int size)
 {
 	int fd, n;