summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMichael Shalayeff <mickey@cvs.openbsd.org>2001-08-03 15:15:10 +0000
committerMichael Shalayeff <mickey@cvs.openbsd.org>2001-08-03 15:15:10 +0000
commitddd170dedc3aa5a283ca155d53a50407d8da8150 (patch)
tree6d00621f1c506ca1dee6413c755bea9806f64f76 /sys
parent8613374f8645907a66642485cb30b4d73787b7fa (diff)
proper vga_* handling; pointed out by tholo@
Diffstat (limited to 'sys')
-rw-r--r--sys/conf/files6
-rw-r--r--sys/dev/isa/files.isa4
-rw-r--r--sys/dev/pci/files.pci4
3 files changed, 7 insertions, 7 deletions
diff --git a/sys/conf/files b/sys/conf/files
index 46ee8ad2fef..ade27a48576 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-# $OpenBSD: files,v 1.217 2001/07/18 12:24:20 art Exp $
+# $OpenBSD: files,v 1.218 2001/08/03 15:15:09 mickey Exp $
# $NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
@@ -70,8 +70,8 @@ file dev/ic/pcdisplay_chars.c pcdisplayops
# VGA graphics
device vga: wsemuldisplaydev, pcdisplayops
-file dev/ic/vga.c vga & vga_pci needs-flag
-file dev/ic/vga_subr.c vga & vga_pci
+file dev/ic/vga.c vga & (vga_pci | vga_isa) needs-flag
+file dev/ic/vga_subr.c vga & (vga_pci | vga_isa) needs-flag
# Attribute for devices that read/write an IEEE 802.3u MII bus using the
# bit-bang method.
diff --git a/sys/dev/isa/files.isa b/sys/dev/isa/files.isa
index bc4e63e1aa5..be99af75704 100644
--- a/sys/dev/isa/files.isa
+++ b/sys/dev/isa/files.isa
@@ -1,4 +1,4 @@
-# $OpenBSD: files.isa,v 1.67 2001/07/17 01:32:18 jason Exp $
+# $OpenBSD: files.isa,v 1.68 2001/08/03 15:15:09 mickey Exp $
# $NetBSD: files.isa,v 1.21 1996/05/16 03:45:55 mycroft Exp $
#
# Config file and device description for machine-independent ISA code.
@@ -72,7 +72,7 @@ file dev/isa/pckbc_isa.c pckbc needs-flag
# Generic ISA VGA
attach vga at isa with vga_isa
-file dev/isa/vga_isa.c vga_isa needs-flag
+file dev/isa/vga_isa.c vga_isa
# Generic EGA
device ega: wsemuldisplaydev, pcdisplayops
diff --git a/sys/dev/pci/files.pci b/sys/dev/pci/files.pci
index 9ec9a800c46..8fd8c7cca38 100644
--- a/sys/dev/pci/files.pci
+++ b/sys/dev/pci/files.pci
@@ -1,4 +1,4 @@
-# $OpenBSD: files.pci,v 1.111 2001/06/25 23:12:52 niklas Exp $
+# $OpenBSD: files.pci,v 1.112 2001/08/03 15:15:09 mickey Exp $
# $NetBSD: files.pci,v 1.20 1996/09/24 17:47:15 christos Exp $
#
# Config file and device description for machine-independent PCI code.
@@ -14,7 +14,7 @@ file dev/pci/pci_subr.c pci
# Generic VGA
attach vga at pci with vga_pci
-file dev/pci/vga_pci.c vga_pci needs-flag
+file dev/pci/vga_pci.c vga_pci
device tga: wsemuldisplaydev, rasops8, rasops32
attach tga at pci