Fix buid (broken by a fix introduced in the wrong file...) trunk
authormanu <manu@NetBSD.org>
Tue, 08 May 2007 09:29:50 +0000
branchtrunk
changeset 158703 27432fb8b4e9
parent 158702 cd22f43ea42d
child 158704 486304537d33
Fix buid (broken by a fix introduced in the wrong file...)
sys/nfs/nfs_boot.c
sys/nfs/nfs_bootdhcp.c
--- a/sys/nfs/nfs_boot.c	Tue May 08 08:18:16 2007 +0000
+++ b/sys/nfs/nfs_boot.c	Tue May 08 09:29:50 2007 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_boot.c,v 1.65 2007/05/08 06:10:28 manu Exp $	*/
+/*	$NetBSD: nfs_boot.c,v 1.66 2007/05/08 09:29:50 manu Exp $	*/
 
 /*-
  * Copyright (c) 1995, 1997 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_boot.c,v 1.65 2007/05/08 06:10:28 manu Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_boot.c,v 1.66 2007/05/08 09:29:50 manu Exp $");
 
 #include "opt_nfs.h"
 #include "opt_tftproot.h"
@@ -171,7 +171,9 @@
 	if (error)
 		nfs_boot_cleanup(nd, lwp);
 
+#ifdef TFTPROOT
 out:
+#endif
 	return (error);
 }
 
--- a/sys/nfs/nfs_bootdhcp.c	Tue May 08 08:18:16 2007 +0000
+++ b/sys/nfs/nfs_bootdhcp.c	Tue May 08 09:29:50 2007 +0000
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_bootdhcp.c,v 1.34 2007/05/08 06:10:28 manu Exp $	*/
+/*	$NetBSD: nfs_bootdhcp.c,v 1.35 2007/05/08 09:29:50 manu Exp $	*/
 
 /*-
  * Copyright (c) 1995, 1997 The NetBSD Foundation, Inc.
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_bootdhcp.c,v 1.34 2007/05/08 06:10:28 manu Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_bootdhcp.c,v 1.35 2007/05/08 09:29:50 manu Exp $");
 
 #include "opt_nfs_boot.h"
 #include "opt_tftproot.h"
@@ -276,9 +276,7 @@
 		goto out;
 	}
 
-#ifdef TFTPROOT
 out:
-#endif
 	if (error) {
 		(void) nfs_boot_ifupdown(ifp, lwp, 0);
 		nfs_boot_flushrt(ifp);