aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorYaroslav Tykhiy <ytykhiy@gmail.com>2005-10-14 23:17:45 +0000
committerYaroslav Tykhiy <ytykhiy@gmail.com>2005-10-14 23:17:45 +0000
commit10d645b7e5a073fc2d4c2bd7472966b4381caf7c (patch)
tree97c97f8faaa373219f25974eabbd67597dd0770f /sys
parent9c3acb0bc1e66c01b60ce64d7252f4607578ef4b (diff)
Notes
Diffstat (limited to 'sys')
-rw-r--r--sys/fs/nwfs/nwfs_vfsops.c4
-rw-r--r--sys/fs/smbfs/smbfs_vfsops.c4
-rw-r--r--sys/netgraph/ng_mppc.c6
3 files changed, 6 insertions, 8 deletions
diff --git a/sys/fs/nwfs/nwfs_vfsops.c b/sys/fs/nwfs/nwfs_vfsops.c
index 2f0ba1fc93c9..4a10c2e3ba8b 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 b774443cbdb3..5c093c175302 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 a6a7a971f6e3..55b021a6b564 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 ");