diff options
| author | ahasty <ahasty@FreeBSD.org> | 1998-04-18 04:58:33 +0000 |
|---|---|---|
| committer | ahasty <ahasty@FreeBSD.org> | 1998-04-18 04:58:33 +0000 |
| commit | 9b24093ea7c0af769f965646b31740b9e7df8c7c (patch) | |
| tree | a5becc7576604d5b9793430176c5fdea88b8a712 /sys/i386/conf | |
| parent | 55586377785790a0bf2bb0bbcddb37583aa4a0e7 (diff) | |
| download | FreeBSD-src-9b24093ea7c0af769f965646b31740b9e7df8c7c.zip FreeBSD-src-9b24093ea7c0af769f965646b31740b9e7df8c7c.tar.gz | |
Reviewed by: Amancio
Submitted by: Roger Hardiman <roger@cs.strath.ac.uk>
Roger Hardiman <roger@cs.strath.ac.uk> :
Revised autodetection code to correctly handle both
old and new VideoLogic Captivator PCI cards.
Added tsleep of 2 seconds to initialistion code for PAL users.
Corrected clock selection code on format change.
--- Amancio
Diffstat (limited to 'sys/i386/conf')
| -rw-r--r-- | sys/i386/conf/LINT | 7 | ||||
| -rw-r--r-- | sys/i386/conf/NOTES | 7 | ||||
| -rw-r--r-- | sys/i386/conf/options.i386 | 5 |
3 files changed, 14 insertions, 5 deletions
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT index f4a6c43..21bf3c4 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.423 1998/03/29 07:58:03 helbig Exp $ +# $Id: LINT,v 1.424 1998/04/09 22:28:57 sos 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 @@ -1330,7 +1330,10 @@ options "EISA_SLOTS=12" # for initialization of fps routine when a signal is not present. # # The 'bktr' device is a PCI video capture board. It also has a TV tuner -# on board. +# on board. To override the tuner detection use +# options OVERRIDE_TUNER=x +# The current values are found in /usr/src/sys/pci/brooktree848.c +# # controller pci0 controller ahc1 diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index f4a6c43..21bf3c4 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.423 1998/03/29 07:58:03 helbig Exp $ +# $Id: LINT,v 1.424 1998/04/09 22:28:57 sos 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 @@ -1330,7 +1330,10 @@ options "EISA_SLOTS=12" # for initialization of fps routine when a signal is not present. # # The 'bktr' device is a PCI video capture board. It also has a TV tuner -# on board. +# on board. To override the tuner detection use +# options OVERRIDE_TUNER=x +# The current values are found in /usr/src/sys/pci/brooktree848.c +# # controller pci0 controller ahc1 diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386 index 5661cf6..c89fdb7 100644 --- a/sys/i386/conf/options.i386 +++ b/sys/i386/conf/options.i386 @@ -1,4 +1,4 @@ -# $Id: options.i386,v 1.75 1998/02/21 10:11:41 eivind Exp $ +# $Id: options.i386,v 1.76 1998/03/09 22:09:11 eivind Exp $ BOUNCEPAGES opt_bounce.h DISABLE_PSE @@ -120,3 +120,6 @@ PCVT_SCANSET opt_pcvt.h PCVT_SCREENSAVER opt_pcvt.h PCVT_USEKBDSEC opt_pcvt.h PCVT_VT220KEYB opt_pcvt.h +# give bktr an opt_bktr.h file +OVERRIDE_TUNER opt_bktr.h + |
