diff options
| author | markm <markm@FreeBSD.org> | 1999-12-19 17:12:19 +0000 |
|---|---|---|
| committer | markm <markm@FreeBSD.org> | 1999-12-19 17:12:19 +0000 |
| commit | 8364513a9e812ef6021c080ef828e8534d4a9465 (patch) | |
| tree | 3b946cab54c0bb2717ddc24fd6c3434d098a1c98 /sys/amd64/conf | |
| parent | d82c29ef6e0ca3baf994cdee4ed642175986c5d3 (diff) | |
| download | FreeBSD-src-8364513a9e812ef6021c080ef828e8534d4a9465.zip FreeBSD-src-8364513a9e812ef6021c080ef828e8534d4a9465.tar.gz | |
Comment and order to reduce diffs. No functional change.
Diffstat (limited to 'sys/amd64/conf')
| -rw-r--r-- | sys/amd64/conf/GENERIC | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index b58e8851..43c1997 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -31,8 +31,8 @@ options MATH_EMULATE #Support for x87 emulation options INET #InterNETworking options FFS #Berkeley Fast Filesystem options FFS_ROOT #FFS usable as root device [keep this!] -options MD_ROOT #MD is a potential root device options MFS #Memory Filesystem +options MD_ROOT #MD is a potential root device options NFS #Network Filesystem options NFS_ROOT #NFS usable as root device, "NFS" req'ed options MSDOSFS #MSDOS Filesystem @@ -180,7 +180,13 @@ device xl0 # 3Com 3c90x (``Boomerang'', ``Cyclone'') # ISA Ethernet NICs. device ed0 at isa? port 0x280 irq 10 iomem 0xd8000 device ex0 at isa? port? irq? +# NOTE: This removes the isa attachment so that the pccard unit numbers +# come out right. device ep0 +# WaveLAN/IEEE 802.1 wireless NICs. Note: the WaveLAN/IEEE really +# exists only as a PCMCIA device, so there is no ISA attatement needed +# and resources will always be dynamically assigned by the pccard code. +#device wi0 # The probe order of these is presently determined by i386/isa/isa_compat.c. device ie0 at isa? port 0x300 irq 10 iomem 0xd0000 device fe0 at isa? port 0x300 irq ? |
