From 8bcb8cba9475ac105c0a4877efa9504eb3c415c8 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Sat, 5 May 2012 17:06:35 +0200 Subject: [PATCH] --- yaml --- r: 300055 b: refs/heads/master c: 377485f6244af255b04d662cf19cddbbc4ae4310 h: refs/heads/master i: 300053: 64bdb3dbd1aaa1ed4fdae1c8aee4541fc7df66ba 300051: 63bf4caa15d6781d3a355cf1b09a71bc7f0998df 300047: e4da3d2ae483e0b0a0e8cdfab4473f48f911e649 v: v3 --- [refs] | 2 +- trunk/init/do_mounts.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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;