diff options
| author | peter <peter@FreeBSD.org> | 2000-01-29 18:07:07 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2000-01-29 18:07:07 +0000 |
| commit | c4b6cd7f5cb058bdcdc11f8fd5fd05e84d69fb2e (patch) | |
| tree | 034e84a7c98f11f8a1f62fb0990d7decb0dfacca /sys/i386 | |
| parent | 7a76a6d4d239205303176878441dd46d265fb50c (diff) | |
| download | FreeBSD-src-c4b6cd7f5cb058bdcdc11f8fd5fd05e84d69fb2e.zip FreeBSD-src-c4b6cd7f5cb058bdcdc11f8fd5fd05e84d69fb2e.tar.gz | |
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.
Diffstat (limited to 'sys/i386')
| -rw-r--r-- | sys/i386/conf/GENERIC | 2 | ||||
| -rw-r--r-- | sys/i386/conf/LINT | 2 | ||||
| -rw-r--r-- | sys/i386/conf/NOTES | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index a668d6f..0d43882 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 e1b2947..d8091a5 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 e1b2947..d8091a5 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 |
