diff options
| author | obrien <obrien@FreeBSD.org> | 1999-07-13 08:08:20 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 1999-07-13 08:08:20 +0000 |
| commit | ad580e436e2b46b4837508f323ead1ac95255b88 (patch) | |
| tree | bb00407e10950459e3870fa0681aca9d2ab74a98 /sys/amd64 | |
| parent | a7e05ba08c96bbb1ced0019e867f0a1c6c8159a4 (diff) | |
| download | FreeBSD-src-ad580e436e2b46b4837508f323ead1ac95255b88.zip FreeBSD-src-ad580e436e2b46b4837508f323ead1ac95255b88.tar.gz | |
Move the xe0 driver back where it was. It was misleading where it was as it
does not take over the PCIC, it does require PCCARD support, and it doesn't
replace any existing driver.
Diffstat (limited to 'sys/amd64')
| -rw-r--r-- | sys/amd64/conf/GENERIC | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 7673537..573f53c 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -15,7 +15,7 @@ # device lines is also 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.175 1999/06/29 18:55:53 peter Exp $ +# $Id: GENERIC,v 1.176 1999/07/06 19:22:38 des Exp $ machine i386 cpu I386_CPU @@ -180,11 +180,12 @@ device fe0 at isa? port 0x300 irq ? device le0 at isa? port 0x300 irq 5 iomem 0xd0000 device lnc0 at isa? port 0x280 irq 10 drq 0 device cs0 at isa? port 0x300 irq ? +# requires PCCARD (PCMCIA) support to be activated +#device xe0 at isa? port? irq ? # PCCARD NIC drivers. # ze and zp take over the pcic and cannot coexist with generic pccard # support, nor the ed and ep drivers they replace. -#device xe0 at isa? port? irq ? #device ze0 at isa? port 0x300 irq 10 iomem 0xd8000 #device zp0 at isa? port 0x300 irq 10 iomem 0xd8000 |
