summaryrefslogtreecommitdiffstats
path: root/release/i386
diff options
context:
space:
mode:
authorscottl <scottl@FreeBSD.org>2003-05-12 02:40:24 +0000
committerscottl <scottl@FreeBSD.org>2003-05-12 02:40:24 +0000
commit002e3de30f346b1a00a774260bbd088259e6aecb (patch)
tree3093d4e7c7f8b27f18fc3e3f4708009ceaa8d003 /release/i386
parentc688fcc3ca312086f910aab7cdf045d92c0c364f (diff)
downloadFreeBSD-src-002e3de30f346b1a00a774260bbd088259e6aecb.zip
FreeBSD-src-002e3de30f346b1a00a774260bbd088259e6aecb.tar.gz
Move the em driver from flopp3 to floppy 2 to make room for the ips driver.
Diffstat (limited to 'release/i386')
-rw-r--r--release/i386/drivers.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/release/i386/drivers.conf b/release/i386/drivers.conf
index 4cb7245..d613c30 100644
--- a/release/i386/drivers.conf
+++ b/release/i386/drivers.conf
@@ -42,6 +42,7 @@ bge if_bge 2 network "Broadcom BCM570xx Gigabit Ethernet"
cue if_cue 2 network "CATC USB ethernet adapter"
dc if_dc 2 network "DEC/Intel 21143 (and clones) PCI fast ethernet card"
ed if_ed 2 network "NE[12]000, SMC Ultra, 3c503, DS8390 ISA ethernet cards"
+em if_em 2 network "Intel Pro/1000 PCI gigabit ethernet card"
fe if_fe 2 network "Fujitsu MB8696x based cards"
fxp if_fxp 2 network "Intel EtherExpress Pro/100B PCI Fast Ethernet card"
kue if_kue 2 network "Kawasaki LSI USB ethernet adapter"
@@ -76,7 +77,6 @@ axe if_axe 3 network "ASIX AX88172 USB 2.0 Ethernet"
an if_an 3 network "Aironet 4500/4800 802.11 PCMCIA/ISA/PCI card"
awi if_awi 3 network "BayStack 660 and others"
de if_de 3 network "DEC DE435 PCI NIC or other DC21040-AA based card"
-em if_em 3 network "Intel Pro/1000 PCI gigabit ethernet card"
ex if_ex 3 network "Intel EtherExpress Pro/10 and Pro/10+"
ie if_ie 3 network "EtherExpress 8/16, 3C507, StarLAN 10 etc."
plip plip 3 network "TCP/IP over parallel"
OpenPOWER on IntegriCloud