[src/netbsd-3]: src/sys/arch/xen/xen Pull up revision 1.29 (requested by yamt...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/84a6f27a9262
branches:  netbsd-3
changeset: 577008:84a6f27a9262
user:      tron <tron%NetBSD.org@localhost>
date:      Sun Aug 21 22:02:14 2005 +0000

description:
Pull up revision 1.29 (requested by yamt in ticket #677):
wrap some code with #if defined(NFS_BOOT_BOOTSTATIC).

diffstat:

 sys/arch/xen/xen/if_xennet.c |  9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diffs (52 lines):

diff -r 2b25e7be081f -r 84a6f27a9262 sys/arch/xen/xen/if_xennet.c
--- a/sys/arch/xen/xen/if_xennet.c      Thu Aug 18 20:46:35 2005 +0000
+++ b/sys/arch/xen/xen/if_xennet.c      Sun Aug 21 22:02:14 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_xennet.c,v 1.13.2.13 2005/07/11 11:41:03 tron Exp $ */
+/*     $NetBSD: if_xennet.c,v 1.13.2.14 2005/08/21 22:02:14 tron Exp $ */
 
 /*
  *
@@ -33,9 +33,10 @@
 
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_xennet.c,v 1.13.2.13 2005/07/11 11:41:03 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_xennet.c,v 1.13.2.14 2005/08/21 22:02:14 tron Exp $");
 
 #include "opt_inet.h"
+#include "opt_nfs_boot.h"
 #include "rnd.h"
 
 #include <sys/param.h>
@@ -69,12 +70,14 @@
 #include <netinet/ip.h>
 #endif
 
+#if defined(NFS_BOOT_BOOTSTATIC)
 #include <nfs/rpcv2.h>
 
 #include <nfs/nfsproto.h>
 #include <nfs/nfs.h>
 #include <nfs/nfsmount.h>
 #include <nfs/nfsdiskless.h>
+#endif /* defined(NFS_BOOT_BOOTSTATIC) */
 
 #include "bpfilter.h"
 #if NBPFILTER > 0
@@ -1213,6 +1216,7 @@
 }
 #endif
 
+#if defined(NFS_BOOT_BOOTSTATIC)
 int
 xennet_bootstatic_callback(struct nfs_diskless *nd)
 {
@@ -1240,6 +1244,7 @@
            NFS_BOOTSTATIC_HAS_MASK|NFS_BOOTSTATIC_HAS_SERVADDR|
            NFS_BOOTSTATIC_HAS_SERVER);
 }
+#endif /* defined(NFS_BOOT_BOOTSTATIC) */
 
 
 #ifdef XENNET_DEBUG_DUMP