summaryrefslogtreecommitdiffstats
path: root/release/picobsd/isp
diff options
context:
space:
mode:
authorpatrick <patrick@FreeBSD.org>2000-03-16 02:45:42 +0000
committerpatrick <patrick@FreeBSD.org>2000-03-16 02:45:42 +0000
commit224e9240a169d649c18985ab5fc3e948a615459d (patch)
tree2d799c8fd84f40236f7fc71efef956c3d48b984b /release/picobsd/isp
parent2e2741fc343f7720ba5acb057ab9ce37b3c3197f (diff)
downloadFreeBSD-src-224e9240a169d649c18985ab5fc3e948a615459d.zip
FreeBSD-src-224e9240a169d649c18985ab5fc3e948a615459d.tar.gz
Remove "conflicts" from kernel config files for picobsd.
PR: 17383 Submitted by: Kelly Yancey <kbyanc@posi.net>
Diffstat (limited to 'release/picobsd/isp')
-rw-r--r--release/picobsd/isp/PICOBSD2
1 files changed, 1 insertions, 1 deletions
diff --git a/release/picobsd/isp/PICOBSD b/release/picobsd/isp/PICOBSD
index d722bc4..dee8fe9 100644
--- a/release/picobsd/isp/PICOBSD
+++ b/release/picobsd/isp/PICOBSD
@@ -56,7 +56,7 @@ device atapicd
# atkbdc0 controls both the keyboard and the PS/2 mouse
device atkbdc0 at isa? port IO_KBD
device atkbd0 at atkbdc? irq 1
-device vga0 at isa? conflicts
+device vga0 at isa?
# syscons is the default console driver, resembling an SCO console
device sc0 at isa?
OpenPOWER on IntegriCloud