summaryrefslogtreecommitdiff
path: root/sys/arch/amd64
diff options
context:
space:
mode:
authorBrad Smith <brad@cvs.openbsd.org>2008-02-25 23:16:48 +0000
committerBrad Smith <brad@cvs.openbsd.org>2008-02-25 23:16:48 +0000
commitfc0ce7fb547eb0cc8f06a5b2ac14a7f809574a5e (patch)
treea5601bf8212385dc090ccf7a62b4b8fc8d3a51f4 /sys/arch/amd64
parenta95762f56878eb7bd172118a3f74af75204929a9 (diff)
- Add lii(4) commented out to the amd64 configs
- Comment out lii(4) in the i386 configs since it does not work yet - Add et(4) to the i386 and amd64 RAMDISK_CD configs ok deraadt@
Diffstat (limited to 'sys/arch/amd64')
-rw-r--r--sys/arch/amd64/conf/GENERIC3
-rw-r--r--sys/arch/amd64/conf/RAMDISK_CD5
2 files changed, 6 insertions, 2 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index fcb2f3c219f..d73dc574843 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.215 2008/02/24 21:49:37 uwe Exp $
+# $OpenBSD: GENERIC,v 1.216 2008/02/25 23:16:47 brad Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -408,6 +408,7 @@ tht* at thtc?
gem* at pci? # Sun 'gem' ethernet
bce* at pci? # Broadcom BCM4401
et* at pci? # Agere/LSI ET1310
+#lii* at pci? # Attansic L2 Ethernet
# Wireless network cards
acx* at pci? # TI ACX100/ACX111 (802.11b/g)
diff --git a/sys/arch/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD
index d1c7c02c2fe..74f9da4abf7 100644
--- a/sys/arch/amd64/conf/RAMDISK_CD
+++ b/sys/arch/amd64/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.80 2007/12/31 19:29:09 deraadt Exp $
+# $OpenBSD: RAMDISK_CD,v 1.81 2008/02/25 23:16:47 brad Exp $
machine amd64 # architecture, used by config; REQUIRED
@@ -273,6 +273,8 @@ vge* at pci? # VIA VT612x
nfe* at pci? # NVIDIA nForce Ethernet
xge* at pci? # Neterion Xframe-I/II 10Gb ethernet
bce* at pci? # Broadcom BCM4401
+et* at pci? # Agere/LSI ET1310
+#lii* at pci? # Attansic L2 Ethernet
# Wireless network cards
ath* at pci? # Atheros AR5k (802.11a/b/g)
@@ -313,6 +315,7 @@ xmphy* at mii? # XaQti XMAC-II PHYs
bmtphy* at mii? # Broadcom 10/100 PHYs
rgephy* at mii? # Realtek 8169S/8110S PHY
ciphy* at mii? # Cicada CS8201 10/100/1000 copper PHY
+etphy* at mii? # Agere/LSI ET1011 TruePHY
ukphy* at mii? # "unknown" PHYs
pseudo-device loop 1 # network loopback