diff options
-rw-r--r-- | sys/fs/nwfs/nwfs_vfsops.c | 4 | ||||
-rw-r--r-- | sys/fs/smbfs/smbfs_vfsops.c | 4 | ||||
-rw-r--r-- | sys/netgraph/ng_mppc.c | 6 |
3 files changed, 6 insertions, 8 deletions
diff --git a/sys/fs/nwfs/nwfs_vfsops.c b/sys/fs/nwfs/nwfs_vfsops.c index 2f0ba1f..4a10c2e 100644 --- a/sys/fs/nwfs/nwfs_vfsops.c +++ b/sys/fs/nwfs/nwfs_vfsops.c @@ -31,10 +31,6 @@ * * $FreeBSD$ */ -#include "opt_ncp.h" -#ifndef NCP -#error "NWFS requires NCP protocol" -#endif #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/fs/smbfs/smbfs_vfsops.c b/sys/fs/smbfs/smbfs_vfsops.c index b774443..5c093c1 100644 --- a/sys/fs/smbfs/smbfs_vfsops.c +++ b/sys/fs/smbfs/smbfs_vfsops.c @@ -31,10 +31,6 @@ * * $FreeBSD$ */ -#include "opt_netsmb.h" -#ifndef NETSMB -#error "SMBFS requires option NETSMB" -#endif #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/netgraph/ng_mppc.c b/sys/netgraph/ng_mppc.c index a6a7a97..55b021a 100644 --- a/sys/netgraph/ng_mppc.c +++ b/sys/netgraph/ng_mppc.c @@ -63,8 +63,14 @@ #include "opt_netgraph.h" #if !defined(NETGRAPH_MPPC_COMPRESSION) && !defined(NETGRAPH_MPPC_ENCRYPTION) +#ifdef KLD_MODULE +/* XXX NETGRAPH_MPPC_COMPRESSION isn't functional yet */ +#define NETGRAPH_MPPC_ENCRYPTION +#else +/* This case is indicative of an error in sys/conf files */ #error Need either NETGRAPH_MPPC_COMPRESSION or NETGRAPH_MPPC_ENCRYPTION #endif +#endif #ifdef NG_SEPARATE_MALLOC MALLOC_DEFINE(M_NETGRAPH_MPPC, "netgraph_mppc", "netgraph mppc node "); |