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.c | |
| parent | 5a7a201c51c324876d00a54e7208af6af12d1ca4 (diff) | |
| parent | c9272c4f9fbe2087beb3392f526dc5b19efaa56b (diff) | |
Merge branch 'linus' into cpus4096
Diffstat (limited to 'init/do_mounts.c')
| -rw-r--r-- | init/do_mounts.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init/do_mounts.c b/init/do_mounts.c index f769fac4f4c0..3715feb8446d 100644 --- a/init/do_mounts.c +++ b/init/do_mounts.c | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | int __initdata rd_doload; /* 1 = load RAM disk, 0 = don't load */ | 23 | int __initdata rd_doload; /* 1 = load RAM disk, 0 = don't load */ |
| 24 | 24 | ||
| 25 | int root_mountflags = MS_RDONLY | MS_SILENT; | 25 | int root_mountflags = MS_RDONLY | MS_SILENT; |
| 26 | char * __initdata root_device_name; | 26 | static char * __initdata root_device_name; |
| 27 | static char __initdata saved_root_name[64]; | 27 | static char __initdata saved_root_name[64]; |
| 28 | static int __initdata root_wait; | 28 | static int __initdata root_wait; |
| 29 | 29 | ||