Drop the 'at nexus?' from the busses, it's not used.
Reactivate eisa0 and pnp0 in GENERIC, they work.. (eisa has been converted but pnp still (for the most part) works the old way).
This commit is contained in:
Peter Wemm
parent
3d88f91408
commit
f71c851c25
@ -11,7 +11,7 @@
|
||||
# device lines is present in the ./LINT configuration file. If you are
|
||||
# in doubt as to the purpose or necessity of a line, check first in LINT.
|
||||
#
|
||||
# $Id: GENERIC,v 1.162 1999/04/16 21:22:07 peter Exp $
|
||||
# $Id: GENERIC,v 1.163 1999/04/19 10:18:34 brian Exp $
|
||||
|
||||
machine "i386"
|
||||
cpu "I386_CPU"
|
||||
@ -53,10 +53,10 @@ config kernel root on wd0
|
||||
#options NAPIC=1 # number of IO APICs
|
||||
#options NINTR=24 # number of INTs
|
||||
|
||||
controller isa0 at nexus?
|
||||
#controller pnp0 # PnP support for ISA
|
||||
#controller eisa0
|
||||
controller pci0 at nexus?
|
||||
controller isa0
|
||||
controller pnp0 # PnP support for ISA
|
||||
controller eisa0
|
||||
controller pci0
|
||||
|
||||
controller fdc0 at isa? port "IO_FD1" bio irq 6 drq 2
|
||||
disk fd0 at fdc0 drive 0
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
# LINT -- config file for checking all the sources, tries to pull in
|
||||
# as much of the source tree as it can.
|
||||
#
|
||||
# $Id: LINT,v 1.583 1999/04/16 21:22:08 peter Exp $
|
||||
# $Id: LINT,v 1.584 1999/04/19 10:18:34 brian Exp $
|
||||
#
|
||||
# NB: You probably don't want to try running a kernel built from this
|
||||
# file. Instead, you should start from GENERIC, and add options from
|
||||
@ -827,7 +827,7 @@ options "MSGBUF_SIZE=40960"
|
||||
#
|
||||
# Mandatory ISA devices: isa, npx
|
||||
#
|
||||
controller isa0 at nexus?
|
||||
controller isa0
|
||||
|
||||
#
|
||||
# Options for `isa':
|
||||
@ -1632,7 +1632,7 @@ options "EISA_SLOTS=12"
|
||||
# The "oltr" driver supports the following Olicom PCI token-ring adapters
|
||||
# OC-3136, OC-3137, OC-3139, OC-3140, OC-3141, OC-3540, OC-3250
|
||||
#
|
||||
controller pci0 at nexus?
|
||||
controller pci0
|
||||
controller ahc1
|
||||
controller ncr0
|
||||
controller isp0
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
# device lines is present in the ./LINT configuration file. If you are
|
||||
# in doubt as to the purpose or necessity of a line, check first in LINT.
|
||||
#
|
||||
# $Id: GENERIC,v 1.162 1999/04/16 21:22:07 peter Exp $
|
||||
# $Id: GENERIC,v 1.163 1999/04/19 10:18:34 brian Exp $
|
||||
|
||||
machine "i386"
|
||||
cpu "I386_CPU"
|
||||
@ -53,10 +53,10 @@ config kernel root on wd0
|
||||
#options NAPIC=1 # number of IO APICs
|
||||
#options NINTR=24 # number of INTs
|
||||
|
||||
controller isa0 at nexus?
|
||||
#controller pnp0 # PnP support for ISA
|
||||
#controller eisa0
|
||||
controller pci0 at nexus?
|
||||
controller isa0
|
||||
controller pnp0 # PnP support for ISA
|
||||
controller eisa0
|
||||
controller pci0
|
||||
|
||||
controller fdc0 at isa? port "IO_FD1" bio irq 6 drq 2
|
||||
disk fd0 at fdc0 drive 0
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
# LINT -- config file for checking all the sources, tries to pull in
|
||||
# as much of the source tree as it can.
|
||||
#
|
||||
# $Id: LINT,v 1.583 1999/04/16 21:22:08 peter Exp $
|
||||
# $Id: LINT,v 1.584 1999/04/19 10:18:34 brian Exp $
|
||||
#
|
||||
# NB: You probably don't want to try running a kernel built from this
|
||||
# file. Instead, you should start from GENERIC, and add options from
|
||||
@ -827,7 +827,7 @@ options "MSGBUF_SIZE=40960"
|
||||
#
|
||||
# Mandatory ISA devices: isa, npx
|
||||
#
|
||||
controller isa0 at nexus?
|
||||
controller isa0
|
||||
|
||||
#
|
||||
# Options for `isa':
|
||||
@ -1632,7 +1632,7 @@ options "EISA_SLOTS=12"
|
||||
# The "oltr" driver supports the following Olicom PCI token-ring adapters
|
||||
# OC-3136, OC-3137, OC-3139, OC-3140, OC-3141, OC-3540, OC-3250
|
||||
#
|
||||
controller pci0 at nexus?
|
||||
controller pci0
|
||||
controller ahc1
|
||||
controller ncr0
|
||||
controller isp0
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
# LINT -- config file for checking all the sources, tries to pull in
|
||||
# as much of the source tree as it can.
|
||||
#
|
||||
# $Id: LINT,v 1.583 1999/04/16 21:22:08 peter Exp $
|
||||
# $Id: LINT,v 1.584 1999/04/19 10:18:34 brian Exp $
|
||||
#
|
||||
# NB: You probably don't want to try running a kernel built from this
|
||||
# file. Instead, you should start from GENERIC, and add options from
|
||||
@ -827,7 +827,7 @@ options "MSGBUF_SIZE=40960"
|
||||
#
|
||||
# Mandatory ISA devices: isa, npx
|
||||
#
|
||||
controller isa0 at nexus?
|
||||
controller isa0
|
||||
|
||||
#
|
||||
# Options for `isa':
|
||||
@ -1632,7 +1632,7 @@ options "EISA_SLOTS=12"
|
||||
# The "oltr" driver supports the following Olicom PCI token-ring adapters
|
||||
# OC-3136, OC-3137, OC-3139, OC-3140, OC-3141, OC-3540, OC-3250
|
||||
#
|
||||
controller pci0 at nexus?
|
||||
controller pci0
|
||||
controller ahc1
|
||||
controller ncr0
|
||||
controller isp0
|
||||
|
||||
Loading…
Reference in New Issue
Block a user