diff options
| author | obrien <obrien@FreeBSD.org> | 1999-09-15 05:45:17 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 1999-09-15 05:45:17 +0000 |
| commit | 5c1a3647e5e952726219b96156a3eebfa5789118 (patch) | |
| tree | a1a7d61cd30dc7bc80b9778e62052c5eee5e3d67 /contrib/amd/conf | |
| parent | e2c605abd09c68a264a51f01f9362d297976ea63 (diff) | |
| download | FreeBSD-src-5c1a3647e5e952726219b96156a3eebfa5789118.zip FreeBSD-src-5c1a3647e5e952726219b96156a3eebfa5789118.tar.gz | |
Fix conflicts.
Diffstat (limited to 'contrib/amd/conf')
| -rw-r--r-- | contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h | 5 | ||||
| -rw-r--r-- | contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h b/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h index f767ffa..e719e99 100644 --- a/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h +++ b/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-1998 Erez Zadok + * Copyright (c) 1997-1999 Erez Zadok * Copyright (c) 1990 Jan-Simon Pendry * Copyright (c) 1990 Imperial College of Science, Technology & Medicine * Copyright (c) 1990 The Regents of the University of California. @@ -38,7 +38,8 @@ * * %W% (Berkeley) %G% * - * $Id: nfs_prot_freebsd2.h,v 1.2 1998/08/27 07:33:23 obrien Exp $ + * $Id: nfs_prot_freebsd2.h,v 1.2 1999/01/10 21:54:14 ezk Exp $ + * $FreeBSD$ * */ diff --git a/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h b/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h index 070ada0..29ce949 100644 --- a/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h +++ b/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997-1998 Erez Zadok + * Copyright (c) 1997-1999 Erez Zadok * Copyright (c) 1990 Jan-Simon Pendry * Copyright (c) 1990 Imperial College of Science, Technology & Medicine * Copyright (c) 1990 The Regents of the University of California. @@ -38,7 +38,8 @@ * * %W% (Berkeley) %G% * - * $Id: nfs_prot_freebsd3.h,v 1.5 1999/01/13 20:03:57 obrien Exp $ + * $Id: nfs_prot_freebsd3.h,v 1.4 1999/03/30 17:22:54 ezk Exp $ + * $FreeBSD$ * */ @@ -66,6 +67,9 @@ struct nfs_fh3; #ifdef HAVE_NFS_NFS_H # include <nfs/nfs.h> #endif /* HAVE_NFS_NFS_H */ +#ifdef HAVE_UFS_UFS_UFSMOUNT_H +# include <ufs/ufs/ufsmount.h> +#endif /* HAVE_UFS_UFS_UFSMOUNT_H */ /* * MACROS: |
