Remove "conflicts" from kernel config files for picobsd.

PR:	17383
Submitted by: Kelly Yancey <kbyanc@posi.net>

7 files changed, 7 insertions, 7 deletions

diff --git a/release/picobsd/bridge/PICOBSD b/release/picobsd/bridge/PICOBSD
index 22025a9..df103fa 100644
--- a/release/picobsd/bridge/PICOBSD
+++ b/release/picobsd/bridge/PICOBSD
@@ -62,7 +62,7 @@ device	atkbdc0	at isa? port IO_KBD
 device		atkbd0	at atkbdc? irq 1
 device          psm0    at atkbdc? irq 12
 
-device		vga0	at isa? conflicts
+device		vga0	at isa?
 
 # syscons is the default console driver, resembling an SCO console
 device		sc0	at isa?
diff --git a/release/picobsd/custom/PICOBSD-C b/release/picobsd/custom/PICOBSD-C
index 9def1e3..880a797 100644
--- a/release/picobsd/custom/PICOBSD-C
+++ b/release/picobsd/custom/PICOBSD-C
@@ -118,7 +118,7 @@ device	atkbdc0	at isa? port IO_KBD
 device		atkbd0	at atkbdc? irq 1
 device		psm0	at atkbdc? irq 12
 
-device		vga0	at isa? port ? conflicts
+device		vga0	at isa? port ?
 
 # splash screen/screen saver
 # pseudo-device	splash
diff --git a/release/picobsd/dial/PICOBSD b/release/picobsd/dial/PICOBSD
index 45d6c5d..f79ade7 100644
--- a/release/picobsd/dial/PICOBSD
+++ b/release/picobsd/dial/PICOBSD
@@ -48,7 +48,7 @@ device	atkbdc0	at isa? port IO_KBD
 device		atkbd0	at atkbdc? irq 1
 device		psm0	at atkbdc? irq 12
 
-device		vga0	at isa? port ? conflicts
+device		vga0	at isa? port ?
 
 # syscons is the default console driver, resembling an SCO console
 device		sc0	at isa?
diff --git a/release/picobsd/install/PICOBSD b/release/picobsd/install/PICOBSD
index 2b8db29..c421df6 100644
--- a/release/picobsd/install/PICOBSD
+++ b/release/picobsd/install/PICOBSD
@@ -51,7 +51,7 @@ device		wd3	at wdc1 drive 1
 
 controller	atkbdc0	at isa? port IO_KBD tty
 device		atkbd0	at isa? tty irq 1
-device		vga0	at isa? port ? conflicts
+device		vga0	at isa? port ?
 device		sc0	at isa? tty
 
 device		npx0	at isa? port IO_NPX irq 13
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?
diff --git a/release/picobsd/net/PICOBSD b/release/picobsd/net/PICOBSD
index dc22d92..e5e7b26 100644
--- a/release/picobsd/net/PICOBSD
+++ b/release/picobsd/net/PICOBSD
@@ -52,7 +52,7 @@ options         ATA_STATIC_ID           #Static device numbering
 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?
diff --git a/release/picobsd/router/PICOBSD b/release/picobsd/router/PICOBSD
index c555de9..f7ae471 100644
--- a/release/picobsd/router/PICOBSD
+++ b/release/picobsd/router/PICOBSD
@@ -48,7 +48,7 @@ device		fd0	at fdc0 drive 0
 device	atkbdc0	at isa? port IO_KBD
 device		atkbd0	at atkbdc? irq 1
 
-device		vga0	at isa? port ? conflicts
+device		vga0	at isa? port ?
 
 # syscons is the default console driver, resembling an SCO console
 device		sc0	at isa?