diff options
author | obrien <obrien@FreeBSD.org> | 1998-11-12 11:29:28 +0000 |
---|---|---|
committer | obrien <obrien@FreeBSD.org> | 1998-11-12 11:29:28 +0000 |
commit | 44fac3553a8a4bed0cb077903c11ceaeac8c8d95 (patch) | |
tree | 28f2fc2d08f7d0b8b4fda18fe9d7d4fbd97d2f40 /sys | |
parent | c95c5b543f391b68d709663bdc36f3ef8788fddb (diff) | |
download | FreeBSD-src-44fac3553a8a4bed0cb077903c11ceaeac8c8d95.zip FreeBSD-src-44fac3553a8a4bed0cb077903c11ceaeac8c8d95.tar.gz |
Remove `amd', `nca' SCSI devices to match Mike's LINT commit.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/amd64/conf/GENERIC | 8 | ||||
-rw-r--r-- | sys/i386/conf/GENERIC | 8 |
2 files changed, 4 insertions, 12 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 11212b8..930349a 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -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.129 1998/11/03 21:12:20 des Exp $ +# $Id: GENERIC,v 1.130 1998/11/03 22:01:21 des Exp $ machine "i386" cpu "I386_CPU" @@ -68,10 +68,9 @@ options ATAPI_STATIC #Don't do it as an LKM device wcd0 #IDE CD-ROM device wfd0 #IDE Floppy (e.g. LS-120) -# A single entry for any of these controllers (ncr, ahb, ahc, amd) is +# A single entry for any of these controllers (ncr, ahb, ahc) is # sufficient for any number of installed devices. controller ncr0 -#controller amd0 controller ahb0 controller ahc0 controller isp0 @@ -87,9 +86,6 @@ controller bt0 at isa? port ? cam irq ? controller aha0 at isa? port ? cam irq ? #controller uha0 at isa? port "IO_UHA0" bio irq ? drq 5 #controller aic0 at isa? port 0x340 bio irq 11 -#controller nca0 at isa? port 0x1f88 bio irq 10 -#controller nca1 at isa? port 0x350 bio irq 5 -#controller sea0 at isa? bio irq 5 iomem 0xc8000 iosiz 0x2000 controller scbus0 diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 11212b8..930349a 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -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.129 1998/11/03 21:12:20 des Exp $ +# $Id: GENERIC,v 1.130 1998/11/03 22:01:21 des Exp $ machine "i386" cpu "I386_CPU" @@ -68,10 +68,9 @@ options ATAPI_STATIC #Don't do it as an LKM device wcd0 #IDE CD-ROM device wfd0 #IDE Floppy (e.g. LS-120) -# A single entry for any of these controllers (ncr, ahb, ahc, amd) is +# A single entry for any of these controllers (ncr, ahb, ahc) is # sufficient for any number of installed devices. controller ncr0 -#controller amd0 controller ahb0 controller ahc0 controller isp0 @@ -87,9 +86,6 @@ controller bt0 at isa? port ? cam irq ? controller aha0 at isa? port ? cam irq ? #controller uha0 at isa? port "IO_UHA0" bio irq ? drq 5 #controller aic0 at isa? port 0x340 bio irq 11 -#controller nca0 at isa? port 0x1f88 bio irq 10 -#controller nca1 at isa? port 0x350 bio irq 5 -#controller sea0 at isa? bio irq 5 iomem 0xc8000 iosiz 0x2000 controller scbus0 |