Remove "conflicts" from kernel config files for picobsd.
PR: 17383 Submitted by: Kelly Yancey <kbyanc@posi.net>
This commit is contained in:
parent
2e2741fc34
commit
224e9240a1
@ -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?
|
||||
|
@ -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
|
||||
|
@ -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?
|
||||
|
@ -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
|
||||
|
@ -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?
|
||||
|
@ -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?
|
||||
|
@ -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?
|
||||
|
Loading…
Reference in New Issue
Block a user