---

yaml --- r: 63991 b: refs/heads/master c: dcbdc93 h: refs/heads/master i: 63989: 02b99f9 63987: 2445b61 63983: 236f038 v: v3
git-mirror · Aug 14, 2007 · dead6a0 · dead6a0
1 parent fa7b1ed
commit dead6a0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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