git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
[pandora-kernel.git]
/
init
/
do_mounts.h
diff --git
a/init/do_mounts.h
b/init/do_mounts.h
index
e7f2e7f
..
9aa968d
100644
(file)
--- a/
init/do_mounts.h
+++ b/
init/do_mounts.h
@@
-1,4
+1,3
@@
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/syscalls.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/syscalls.h>
@@
-12,7
+11,6
@@
void change_floppy(char *fmt, ...);
void mount_block_root(char *name, int flags);
void mount_root(void);
extern int root_mountflags;
void mount_block_root(char *name, int flags);
void mount_root(void);
extern int root_mountflags;
-extern char *root_device_name;
static inline int create_dev(char *name, dev_t dev)
{
static inline int create_dev(char *name, dev_t dev)
{