summaryrefslogtreecommitdiff
path: root/sys/arch/amd64/conf
diff options
context:
space:
mode:
authorMartin Reindl <martin@cvs.openbsd.org>2006-12-06 23:02:37 +0000
committerMartin Reindl <martin@cvs.openbsd.org>2006-12-06 23:02:37 +0000
commit2a24301162ce5f806499191ff90272c1508cb9ad (patch)
tree7a0a3072b914c8583dcaad2f1592f4412a5ca144 /sys/arch/amd64/conf
parent29ace6ff9c7c87c5deb7e7c212ca328a4434dec5 (diff)
starfire ethernet works here now
Diffstat (limited to 'sys/arch/amd64/conf')
-rw-r--r--sys/arch/amd64/conf/GENERIC4
-rw-r--r--sys/arch/amd64/conf/RAMDISK_CD4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 45d7e2d418e..3b746b9a638 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.170 2006/11/29 13:08:49 grange Exp $
+# $OpenBSD: GENERIC,v 1.171 2006/12/06 23:02:36 martin Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -343,7 +343,7 @@ epic* at pci? # SMC EPIC/100 ethernet
#tl* at pci? # Compaq Thunderlan ethernet
vr* at pci? # VIA Rhine ethernet
#wb* at pci? # Winbond W89C840F ethernet
-#sf* at pci? # Adaptec AIC-6915 ethernet BORKED
+sf* at pci? # Adaptec AIC-6915 ethernet
sis* at pci? # SiS 900/7016 ethernet
#ste* at pci? # Sundance ST201 ethernet BORKED
pcn* at pci? # AMD PCnet-PCI Ethernet
diff --git a/sys/arch/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD
index 221ad75795b..3503a111bef 100644
--- a/sys/arch/amd64/conf/RAMDISK_CD
+++ b/sys/arch/amd64/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.64 2006/11/25 20:44:30 dlg Exp $
+# $OpenBSD: RAMDISK_CD,v 1.65 2006/12/06 23:02:36 martin Exp $
machine amd64 # architecture, used by config; REQUIRED
@@ -238,7 +238,7 @@ em* at pci? # Intel Pro/1000 ethernet
ixgb* at pci? # Intel Pro/10Gb ethernet
#txp* at pci? # 3com 3CR990
#nge* at pci? # NS DP83820/DP83821 GigE
-#sf* at pci? # Adaptec AIC-6915 ethernet
+sf* at pci? # Adaptec AIC-6915 ethernet
bge* at pci? # Broadcom BCM57xx (aka Tigon3)
bnx* at pci? # Broadcom BCM5706/5708 GigE
re* at pci? # Realtek 8169/8169S/8110S