jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-12-04 05:58:57 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Remove 'conflicts' token - it has been effectively doing absolutely

Browse Source 
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.
This commit is contained in:
Peter Wemm 2000-01-29 18:07:07 +00:00
parent c50e6e7a39
commit 68b538c712
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=56867
9 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/alpha/conf/GENERIC
View File

@ -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

2
sys/alpha/conf/NOTES
View File

@ -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

2
sys/amd64/conf/GENERIC
View File

@ -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

2
sys/conf/NOTES
View File

@ -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

2
sys/i386/conf/GENERIC
View File

@ -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

2
sys/i386/conf/LINT
View File

@ -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

2
sys/i386/conf/NOTES
View File

@ -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

2
sys/pc98/conf/GENERIC
View File

@ -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

2
sys/pc98/conf/GENERIC98
View File

@ -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