From 68b538c7124c308a43503c5d922740f9243d15ee Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Sat, 29 Jan 2000 18:07:07 +0000
Subject: [PATCH] Remove 'conflicts' token - it has been effectively doing
 absolutely nothing for quite some time.  The only thing that cared was
 userconfig, but it was for one invisible device so we never saw it's effects.

---
 sys/alpha/conf/GENERIC  | 2 +-
 sys/alpha/conf/NOTES    | 2 +-
 sys/amd64/conf/GENERIC  | 2 +-
 sys/conf/NOTES          | 2 +-
 sys/i386/conf/GENERIC   | 2 +-
 sys/i386/conf/LINT      | 2 +-
 sys/i386/conf/NOTES     | 2 +-
 sys/pc98/conf/GENERIC   | 2 +-
 sys/pc98/conf/GENERIC98 | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/sys/alpha/conf/GENERIC b/sys/alpha/conf/GENERIC
index b01973957956..9aaac2fd25f4 100644
--- a/sys/alpha/conf/GENERIC
+++ b/sys/alpha/conf/GENERIC
@@ -95,7 +95,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?
 
 # splash screen/screen saver
 pseudo-device	splash
diff --git a/sys/alpha/conf/NOTES b/sys/alpha/conf/NOTES
index b01973957956..9aaac2fd25f4 100644
--- a/sys/alpha/conf/NOTES
+++ b/sys/alpha/conf/NOTES
@@ -95,7 +95,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?
 
 # splash screen/screen saver
 pseudo-device	splash
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index a668d6f03767..0d4388275eff 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -113,7 +113,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?
 
 # splash screen/screen saver
 pseudo-device	splash
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index e1b294719b02..d8091a56b205 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -951,7 +951,7 @@ options 	PSM_HOOKRESUME		#hook the system resume event, useful
 options 	PSM_RESETAFTERSUSPEND	#reset the device at the resume event
 
 # The video card driver.
-device		vga0	at isa? conflicts
+device		vga0	at isa?
 
 # Options for vga:
 # Try the following option if the mouse pointer is not drawn correctly
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index a668d6f03767..0d4388275eff 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -113,7 +113,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?
 
 # splash screen/screen saver
 pseudo-device	splash
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index e1b294719b02..d8091a56b205 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -951,7 +951,7 @@ options 	PSM_HOOKRESUME		#hook the system resume event, useful
 options 	PSM_RESETAFTERSUSPEND	#reset the device at the resume event
 
 # The video card driver.
-device		vga0	at isa? conflicts
+device		vga0	at isa?
 
 # Options for vga:
 # Try the following option if the mouse pointer is not drawn correctly
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index e1b294719b02..d8091a56b205 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -951,7 +951,7 @@ options 	PSM_HOOKRESUME		#hook the system resume event, useful
 options 	PSM_RESETAFTERSUSPEND	#reset the device at the resume event
 
 # The video card driver.
-device		vga0	at isa? conflicts
+device		vga0	at isa?
 
 # Options for vga:
 # Try the following option if the mouse pointer is not drawn correctly
diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC
index 3e790d7b20cf..f6a2a0d56549 100644
--- a/sys/pc98/conf/GENERIC
+++ b/sys/pc98/conf/GENERIC
@@ -272,7 +272,7 @@ device		sn
 #device		xe0	at isa?
 
 #device	snd
-#device	sb0	at isa? port 0x20d2 irq 10 conflicts drq 3
+#device	sb0	at isa? port 0x20d2 irq 10 drq 3
 #device	sbxvi0 	at isa? drq 3
 #device	sbmidi0	at isa? port 0x80d2
 #device	opl0	at isa? port 0x28d2
diff --git a/sys/pc98/conf/GENERIC98 b/sys/pc98/conf/GENERIC98
index 3e790d7b20cf..f6a2a0d56549 100644
--- a/sys/pc98/conf/GENERIC98
+++ b/sys/pc98/conf/GENERIC98
@@ -272,7 +272,7 @@ device		sn
 #device		xe0	at isa?
 
 #device	snd
-#device	sb0	at isa? port 0x20d2 irq 10 conflicts drq 3
+#device	sb0	at isa? port 0x20d2 irq 10 drq 3
 #device	sbxvi0 	at isa? drq 3
 #device	sbmidi0	at isa? port 0x80d2
 #device	opl0	at isa? port 0x28d2