aboutsummaryrefslogtreecommitdiff
path: root/sys/i386
diff options
context:
space:
mode:
authorBruce Evans <bde@FreeBSD.org>1998-06-21 13:36:53 +0000
committerBruce Evans <bde@FreeBSD.org>1998-06-21 13:36:53 +0000
commitabc97a061135fe7ea3d86dbf6e36b0d9be826d73 (patch)
treed74c1426c5354ff9abe18ee75d09c6f38ab2189a /sys/i386
parent29c0cb37ebe25b8818804a61c806137f414bbdf3 (diff)
downloadsrc-abc97a061135fe7ea3d86dbf6e36b0d9be826d73.tar.gz
src-abc97a061135fe7ea3d86dbf6e36b0d9be826d73.zip
Moved P1003 options from the middle of the devices section to the
end of the main options section. Turned on documented option OVERRIDE_TUNER. LINT is primarily for turning on options, not for documenting them. Don't list IPFILTER twice (once as broken).
Notes
Notes: svn path=/head/; revision=37090
Diffstat (limited to 'sys/i386')
-rw-r--r--sys/i386/conf/LINT31
-rw-r--r--sys/i386/conf/NOTES31
2 files changed, 30 insertions, 32 deletions
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 1f1b97e79f92..d2417a2abf04 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.436 1998/06/05 22:39:45 julian Exp $
+# $Id: LINT,v 1.437 1998/06/08 06:18:53 bde 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
@@ -535,6 +535,19 @@ options SUIDDIR
#####################################################################
+# POSIX P1003.1B
+
+# Real time extensions added int the 1993 Posix
+# P1003_1B: Infrastructure
+# _KPOSIX_PRIORITY_SCHEDULING: Build in _POSIX_PRIORITY_SCHEDULING
+# _KPOSIX_VERSION: Version kernel is built for
+
+options "P1003_1B"
+options "_KPOSIX_PRIORITY_SCHEDULING"
+options "_KPOSIX_VERSION=199309L"
+
+
+#####################################################################
# SCSI DEVICES
# SCSI DEVICE CONFIGURATION
@@ -624,19 +637,6 @@ options OD_AUTO_TURNOFF
#####################################################################
-# POSIX P1003.1B
-
-# Real time extensions added int the 1993 Posix
-# P1003_1B: Infrastructure
-# _KPOSIX_PRIORITY_SCHEDULING: Build in _POSIX_PRIORITY_SCHEDULING
-# _KPOSIX_VERSION: Version kernel is built for
-
-options "P1003_1B"
-options "_KPOSIX_PRIORITY_SCHEDULING"
-options "_KPOSIX_VERSION=199309L"
-
-
-#####################################################################
# MISCELLANEOUS DEVICES AND OPTIONS
# The `pty' device usually turns out to be ``effectively mandatory'',
@@ -1374,6 +1374,7 @@ device fpa0
device meteor0
device bktr0
+options OVERRIDE_TUNER=NO_TUNER
#
# PCCARD/PCMCIA
@@ -1471,8 +1472,6 @@ options "DEBUG_1284"
options "EXT2FS"
options "I586_PMC_GUPROF=0x70000"
options "IBCS2"
-# broken:
-#options IPFILTER
options KEY
options KEY_DEBUG
options LOCKF_DEBUG
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 1f1b97e79f92..d2417a2abf04 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.436 1998/06/05 22:39:45 julian Exp $
+# $Id: LINT,v 1.437 1998/06/08 06:18:53 bde 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
@@ -535,6 +535,19 @@ options SUIDDIR
#####################################################################
+# POSIX P1003.1B
+
+# Real time extensions added int the 1993 Posix
+# P1003_1B: Infrastructure
+# _KPOSIX_PRIORITY_SCHEDULING: Build in _POSIX_PRIORITY_SCHEDULING
+# _KPOSIX_VERSION: Version kernel is built for
+
+options "P1003_1B"
+options "_KPOSIX_PRIORITY_SCHEDULING"
+options "_KPOSIX_VERSION=199309L"
+
+
+#####################################################################
# SCSI DEVICES
# SCSI DEVICE CONFIGURATION
@@ -624,19 +637,6 @@ options OD_AUTO_TURNOFF
#####################################################################
-# POSIX P1003.1B
-
-# Real time extensions added int the 1993 Posix
-# P1003_1B: Infrastructure
-# _KPOSIX_PRIORITY_SCHEDULING: Build in _POSIX_PRIORITY_SCHEDULING
-# _KPOSIX_VERSION: Version kernel is built for
-
-options "P1003_1B"
-options "_KPOSIX_PRIORITY_SCHEDULING"
-options "_KPOSIX_VERSION=199309L"
-
-
-#####################################################################
# MISCELLANEOUS DEVICES AND OPTIONS
# The `pty' device usually turns out to be ``effectively mandatory'',
@@ -1374,6 +1374,7 @@ device fpa0
device meteor0
device bktr0
+options OVERRIDE_TUNER=NO_TUNER
#
# PCCARD/PCMCIA
@@ -1471,8 +1472,6 @@ options "DEBUG_1284"
options "EXT2FS"
options "I586_PMC_GUPROF=0x70000"
options "IBCS2"
-# broken:
-#options IPFILTER
options KEY
options KEY_DEBUG
options LOCKF_DEBUG