diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 5115a4c3593f..42f34b7e10af 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.404 1998/02/11 15:36:46 jkh Exp $
+#	$Id: LINT,v 1.405 1998/02/11 17:37:55 yokota Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -1376,6 +1376,10 @@ options		BOOTP_COMPAT	# Workaround for broken bootp daemons.
 #
 options		GATEWAY
 
+# If you want to disable loadable kernel modules (LKM), you
+# might want to use this option.
+options		NO_LKM
+
 # More undocumented options for linting.
 
 options		CLK_CALIBRATION_LOOP
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 5115a4c3593f..42f34b7e10af 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.404 1998/02/11 15:36:46 jkh Exp $
+#	$Id: LINT,v 1.405 1998/02/11 17:37:55 yokota Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -1376,6 +1376,10 @@ options		BOOTP_COMPAT	# Workaround for broken bootp daemons.
 #
 options		GATEWAY
 
+# If you want to disable loadable kernel modules (LKM), you
+# might want to use this option.
+options		NO_LKM
+
 # More undocumented options for linting.
 
 options		CLK_CALIBRATION_LOOP
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 5115a4c3593f..42f34b7e10af 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.404 1998/02/11 15:36:46 jkh Exp $
+#	$Id: LINT,v 1.405 1998/02/11 17:37:55 yokota Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -1376,6 +1376,10 @@ options		BOOTP_COMPAT	# Workaround for broken bootp daemons.
 #
 options		GATEWAY
 
+# If you want to disable loadable kernel modules (LKM), you
+# might want to use this option.
+options		NO_LKM
+
 # More undocumented options for linting.
 
 options		CLK_CALIBRATION_LOOP
diff --git a/sys/kern/kern_lkm.c b/sys/kern/kern_lkm.c
index 7c46f7dfef47..700eb9870d8a 100644
--- a/sys/kern/kern_lkm.c
+++ b/sys/kern/kern_lkm.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: kern_lkm.c,v 1.45 1997/11/06 19:29:11 phk Exp $
+ * $Id: kern_lkm.c,v 1.46 1998/01/24 02:54:34 eivind Exp $
  */
 
 #include "opt_devfs.h"
@@ -946,6 +946,6 @@ static void 	lkm_drvinit(void *unused)
     	}
 }
 
+#ifndef NO_LKM
 SYSINIT(lkmdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,lkm_drvinit,NULL)
-
-
+#endif