diff --git a/[refs] b/[refs] index afdea3db4f72..d78f4602c971 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6f24f892871acc47b40dd594c63606a17c714f77 +refs/heads/master: 377485f6244af255b04d662cf19cddbbc4ae4310 diff --git a/trunk/init/do_mounts.c b/trunk/init/do_mounts.c index 0e93f92a0345..42b0707c3481 100644 --- a/trunk/init/do_mounts.c +++ b/trunk/init/do_mounts.c @@ -472,7 +472,7 @@ void __init change_floppy(char *fmt, ...) void __init mount_root(void) { #ifdef CONFIG_ROOT_NFS - if (MAJOR(ROOT_DEV) == UNNAMED_MAJOR) { + if (ROOT_DEV == Root_NFS) { if (mount_nfs_root()) return;