From dead6a095bd4833bfae2ed5375dcd70e7ebd4e30 Mon Sep 17 00:00:00 2001
From: Joakim Tjernlund <joakim.tjernlund@transmode.se>
Date: Fri, 10 Aug 2007 15:14:54 -0700
Subject: [PATCH] --- yaml --- r: 63991 b: refs/heads/master c:
 dcbdc93c6c64daf20622d6deae774d1e740efb8d h: refs/heads/master i:   63989:
 02b99f94275d3a68c8ccc0a79a6da9a6563e6a7c   63987:
 2445b61b3187d860fab76ed60e3e4732cfecb62e   63983:
 236f03826733ef92785acd0a9dd812cbe7b8a181 v: v3

---
 [refs]                    | 2 +-
 trunk/net/ipv4/ipconfig.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 2c16ecbcbed9..5ade4856c563 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8aee929eda10b2502fd76c0bf2003f89f7992820
+refs/heads/master: dcbdc93c6c64daf20622d6deae774d1e740efb8d
diff --git a/trunk/net/ipv4/ipconfig.c b/trunk/net/ipv4/ipconfig.c
index 342ca8d89458..c5b247077539 100644
--- a/trunk/net/ipv4/ipconfig.c
+++ b/trunk/net/ipv4/ipconfig.c
@@ -1281,9 +1281,9 @@ static int __init ip_auto_config(void)
 	 */
 	if (ic_myaddr == NONE ||
 #ifdef CONFIG_ROOT_NFS
-	    (MAJOR(ROOT_DEV) == UNNAMED_MAJOR
-	     && root_server_addr == NONE
-	     && ic_servaddr == NONE) ||
+	    (root_server_addr == NONE
+	     && ic_servaddr == NONE
+	     && ROOT_DEV == Root_NFS) ||
 #endif
 	    ic_first_dev->next) {
 #ifdef IPCONFIG_DYNAMIC