diff options
| -rw-r--r-- | sys/conf/options | 9 | ||||
| -rw-r--r-- | sys/conf/options.i386 | 5 | ||||
| -rw-r--r-- | sys/i386/conf/options.i386 | 5 | ||||
| -rw-r--r-- | sys/i386/isa/spigot.c | 1 | ||||
| -rw-r--r-- | sys/pci/meteor.c | 1 |
5 files changed, 18 insertions, 3 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 diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386 index 67ab269..564132c 100644 --- a/sys/i386/conf/options.i386 +++ b/sys/i386/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 diff --git a/sys/i386/isa/spigot.c b/sys/i386/isa/spigot.c index 4639a14..50aebba 100644 --- a/sys/i386/isa/spigot.c +++ b/sys/i386/isa/spigot.c @@ -52,6 +52,7 @@ error "Can only have 1 spigot configured." #endif #include "opt_devfs.h" +#include "opt_spigot.h" #include <sys/param.h> #include <sys/systm.h> diff --git a/sys/pci/meteor.c b/sys/pci/meteor.c index 8603018..65824ca 100644 --- a/sys/pci/meteor.c +++ b/sys/pci/meteor.c @@ -147,6 +147,7 @@ #if NMETEOR > 0 #include "opt_devfs.h" +#include "opt_meteor.h" #include <sys/param.h> #include <sys/systm.h> |
