diff options
| author | Peter Wemm <peter@FreeBSD.org> | 2002-02-28 03:07:35 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 2002-02-28 03:07:35 +0000 |
| commit | 85a745c15ed8cb4a6292a7039617ea453aac65ce (patch) | |
| tree | fc9caab6f92082636777e93202a93015cabaad00 /sys/amd64 | |
| parent | 9a7fefa51e8c3ae788d9aef8d7b291db612d0de0 (diff) | |
Notes
Diffstat (limited to 'sys/amd64')
| -rw-r--r-- | sys/amd64/amd64/autoconf.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/amd64/amd64/autoconf.c b/sys/amd64/amd64/autoconf.c index a816eedecfde..618b2c69a621 100644 --- a/sys/amd64/amd64/autoconf.c +++ b/sys/amd64/amd64/autoconf.c @@ -95,7 +95,7 @@ static void configure_first __P((void *)); static void configure __P((void *)); static void configure_final __P((void *)); -#if defined(NFSCLIENT) && defined(NFS_ROOT) +#if defined(NFSCLIENT) && defined(NFS_ROOT) && !defined(BOOTP_NFSROOT) static void pxe_setup_nfsdiskless(void); #endif @@ -219,9 +219,6 @@ configure_final(dummy) cold = 0; } -#ifdef BOOTP -extern void bootpc_init(void); -#endif /* * Do legacy root filesystem discovery. */ @@ -243,7 +240,7 @@ SYSINIT(cpu_rootconf, SI_SUB_ROOT_CONF, SI_ORDER_FIRST, cpu_rootconf, NULL) u_long bootdev = 0; /* not a dev_t - encoding is different */ -#if defined(NFSCLIENT) && defined(NFS_ROOT) +#if defined(NFSCLIENT) && defined(NFS_ROOT) && !defined(BOOTP_NFSROOT) static int inaddr_to_sockaddr(char *ev, struct sockaddr_in *sa) |