diff options
| author | jkh <jkh@FreeBSD.org> | 1998-08-08 19:26:08 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1998-08-08 19:26:08 +0000 |
| commit | e06e9def27545b5976a299a93770825c31ae234d (patch) | |
| tree | 58e4efd60572b579f5d69e986254aa8921ced777 /sys/conf | |
| parent | 993b274d0375fe6121794409bc94d2f0438211e6 (diff) | |
| download | FreeBSD-src-e06e9def27545b5976a299a93770825c31ae234d.zip FreeBSD-src-e06e9def27545b5976a299a93770825c31ae234d.tar.gz | |
A few misc changes to get the spigot and meteor board working in 3.0.
Submitted by: Jim Lowe <james@miller.cs.uwm.edu>
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/options | 9 | ||||
| -rw-r--r-- | sys/conf/options.i386 | 5 |
2 files changed, 12 insertions, 2 deletions
diff --git a/sys/conf/options b/sys/conf/options index e2b0d84..864b185 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -1,4 +1,4 @@ -# $Id: options,v 1.88 1998/07/12 01:48:14 bde Exp $ +# $Id: options,v 1.89 1998/08/05 00:54:36 eivind Exp $ # # On the handling of kernel options # @@ -259,5 +259,12 @@ NFS_DEBUG opt_nfs.h # give bktr an opt_bktr.h file OVERRIDE_TUNER opt_bktr.h +# meteor opt_meteor.h +METEOR_ALLOC_PAGES opt_meteor.h +METEOR_TEST_VIDEO opt_meteor.h +METEOR_SYSTEM_DEFAULT opt_meteor.h +METEOR_DEALLOC_PAGES opt_meteor.h +METEOR_DEALLOC_ABOVE opt_meteor.h + # Include tweaks for running under the SimOS machine simulator. SIMOS opt_simos.h diff --git a/sys/conf/options.i386 b/sys/conf/options.i386 index 67ab269..564132c 100644 --- a/sys/conf/options.i386 +++ b/sys/conf/options.i386 @@ -1,4 +1,4 @@ -# $Id: options.i386,v 1.81 1998/06/30 08:40:32 jmg Exp $ +# $Id: options.i386,v 1.82 1998/06/30 14:43:03 bde Exp $ BOUNCEPAGES opt_bounce.h DISABLE_PSE @@ -123,3 +123,6 @@ PCVT_VT220KEYB opt_pcvt.h GUS_DMA2 opt_sound.h GUS_DMA opt_sound.h GUS_IRQ opt_sound.h + +# Video spigot +SPIGOT_UNSECURE opt_spigot.h |
