diff options
author | Tony Luck <tony.luck@intel.com> | 2005-07-15 19:59:00 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-07-15 19:59:00 -0400 |
commit | 08848e446bcd2130c26945be966446389d25bcc2 (patch) | |
tree | e31e6ec7a1d9e8f6bbf8cdee2692eb42f4869f47 /init/do_mounts.c | |
parent | 46906c4415f88cebfad530917bada0835d651824 (diff) | |
parent | 38d84c3bd6dd22bdb1f797c87006931133d71aea (diff) |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'init/do_mounts.c')
-rw-r--r-- | init/do_mounts.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/init/do_mounts.c b/init/do_mounts.c index 1b02be734ccc..4e11a9aaf14a 100644 --- a/init/do_mounts.c +++ b/init/do_mounts.c | |||
@@ -26,8 +26,6 @@ static char __initdata saved_root_name[64]; | |||
26 | /* this is initialized in init/main.c */ | 26 | /* this is initialized in init/main.c */ |
27 | dev_t ROOT_DEV; | 27 | dev_t ROOT_DEV; |
28 | 28 | ||
29 | EXPORT_SYMBOL(ROOT_DEV); | ||
30 | |||
31 | static int __init load_ramdisk(char *str) | 29 | static int __init load_ramdisk(char *str) |
32 | { | 30 | { |
33 | rd_doload = simple_strtol(str,NULL,0) & 3; | 31 | rd_doload = simple_strtol(str,NULL,0) & 3; |