summaryrefslogtreecommitdiff
path: root/sys/conf
diff options
context:
space:
mode:
authorTed Unangst <tedu@cvs.openbsd.org>2014-10-09 03:36:33 +0000
committerTed Unangst <tedu@cvs.openbsd.org>2014-10-09 03:36:33 +0000
commit091ff3aacf21b94618bc4bed70df2d6a829716f4 (patch)
tree78e437464fe9515ece5f0dc849cbc4ebd3b88522 /sys/conf
parentb6b15776bf3ee59294a35aaca424076f3bef0c22 (diff)
remove LKM
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/GENERIC4
-rw-r--r--sys/conf/files3
2 files changed, 2 insertions, 5 deletions
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC
index 33f437a2ae4..a265eeaec69 100644
--- a/sys/conf/GENERIC
+++ b/sys/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.212 2014/10/01 10:08:29 mpi Exp $
+# $OpenBSD: GENERIC,v 1.213 2014/10/09 03:36:32 tedu Exp $
#
# Machine-independent option; used by all architectures for their
# GENERIC kernel
@@ -30,8 +30,6 @@ option UVM_SWAP_ENCRYPT# support encryption of pages going to swap
option COMPAT_43 # Kernel compatibility with 4.3BSD
-option LKM # loadable kernel modules
-
option FFS # UFS
option FFS2 # UFS2
option FFS_SOFTUPDATES # Soft updates
diff --git a/sys/conf/files b/sys/conf/files
index 09408f8d918..680b077acea 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-# $OpenBSD: files,v 1.579 2014/10/07 20:23:31 tedu Exp $
+# $OpenBSD: files,v 1.580 2014/10/09 03:36:32 tedu Exp $
# $NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
@@ -674,7 +674,6 @@ file kern/kern_fork.c
file kern/kern_kthread.c
file kern/kern_ktrace.c ktrace
file kern/kern_lock.c
-file kern/kern_lkm.c lkm
file kern/kern_malloc.c
file kern/kern_malloc_debug.c malloc_debug
file kern/kern_rwlock.c