diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-28 15:14:43 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-28 15:14:43 -0400 |
| commit | 414f746d232d41ed6ae8632c4495ae795373c44b (patch) | |
| tree | 167f9bc8f139c6e82e6732b38c7a938b8a9d31cd /init/do_mounts.h | |
| parent | 5a7a201c51c324876d00a54e7208af6af12d1ca4 (diff) | |
| parent | c9272c4f9fbe2087beb3392f526dc5b19efaa56b (diff) | |
Merge branch 'linus' into cpus4096
Diffstat (limited to 'init/do_mounts.h')
| -rw-r--r-- | init/do_mounts.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/init/do_mounts.h b/init/do_mounts.h index 735705d137ff..9aa968d54329 100644 --- a/init/do_mounts.h +++ b/init/do_mounts.h | |||
| @@ -11,7 +11,6 @@ void change_floppy(char *fmt, ...); | |||
| 11 | void mount_block_root(char *name, int flags); | 11 | void mount_block_root(char *name, int flags); |
| 12 | void mount_root(void); | 12 | void mount_root(void); |
| 13 | extern int root_mountflags; | 13 | extern int root_mountflags; |
| 14 | extern char *root_device_name; | ||
| 15 | 14 | ||
| 16 | static inline int create_dev(char *name, dev_t dev) | 15 | static inline int create_dev(char *name, dev_t dev) |
| 17 | { | 16 | { |