summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/sparc64/conf/GENERIC23
-rw-r--r--sys/arch/sparc64/conf/RAMDISK5
2 files changed, 17 insertions, 11 deletions
diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC
index 51ee3769450..21303a845e9 100644
--- a/sys/arch/sparc64/conf/GENERIC
+++ b/sys/arch/sparc64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.129 2005/06/17 23:50:38 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.130 2005/06/30 01:08:48 brad Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -47,15 +47,17 @@ ebus* at pci?
# PCI Ethernet
hme* at pci?
gem* at pci?
-#ti* at pci? # Alteon Tigon 1Gb ethernet
-fxp* at pci? # EtherExpress 10/100B ethernet
-xl* at pci? # 3C9xx ethernet
-dc* at pci? # 21143, "tulip" clone ethernet
-epic* at pci? # SMC EPIC/100 ethernet
-em* at pci? # Intel Pro/1000 ethernet
-rl* at pci? # RealTek 81[23]9 ethernet
-vr* at pci? # VIA Rhine ethernet
-re* at pci? # Realtek 8169/8169S/8110S
+#ti* at pci? # Alteon Tigon 1Gb ethernet
+fxp* at pci? # EtherExpress 10/100B ethernet
+xl* at pci? # 3C9xx ethernet
+dc* at pci? # 21143, "tulip" clone ethernet
+epic* at pci? # SMC EPIC/100 ethernet
+em* at pci? # Intel Pro/1000 ethernet
+#bge* at pci? # Broadcom BCM570x (aka Tigon3)
+stge* at pci? # Sundance TC9021 GigE
+rl* at pci? # RealTek 81[23]9 ethernet
+vr* at pci? # VIA Rhine ethernet
+re* at pci? # RealTek 8169/8169S/8110S
# PCI SCSI
ahc* at pci? # Adaptec 2940 SCSI controllers
@@ -277,6 +279,7 @@ acphy* at mii? # Altima AC101 PHYs
exphy* at mii? # 3Com internal PHYs
bmtphy* at mii? # Broadcom 10/100 PHYs
brgphy* at mii? # Broadcom PHYs
+eephy* at mii? # Marvell 88E1000 series PHY
nsphy* at mii? # NS and compatible PHYs
qsphy* at mii? # Quality Semi QS6612 PHYs
luphy* at mii? # Lucent LU6612 PHY
diff --git a/sys/arch/sparc64/conf/RAMDISK b/sys/arch/sparc64/conf/RAMDISK
index 03ceb35b251..cda14e0c1bc 100644
--- a/sys/arch/sparc64/conf/RAMDISK
+++ b/sys/arch/sparc64/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.45 2005/06/16 14:13:26 deraadt Exp $
+# $OpenBSD: RAMDISK,v 1.46 2005/06/30 01:08:48 brad Exp $
# Machine architecture; required by config(8)
machine sparc64
@@ -58,6 +58,8 @@ xl* at pci? # 3C9xx ethernet
dc* at pci? # 21143, "tulip" clone ethernet
epic* at pci? # SMC EPIC/100 ethernet
em* at pci? # Intel Pro/1000 ethernet
+#bge* at pci? # Broadcom BCM570x (aka Tigon3)
+stge* at pci? # Sundance TC9021 GigE
rl* at pci? # RealTek 81[23]9 ethernet
vr* at pci? # VIA Rhine ethernet
@@ -122,6 +124,7 @@ acphy* at mii? # Altima AC101 PHYs
exphy* at mii? # 3Com internal PHYs
bmtphy* at mii? # Broadcom 10/100 PHYs
brgphy* at mii? # Broadcom PHYs
+eephy* at mii? # Marvell 88E1000 series PHY
nsphy* at mii? # NS and compatible PHYs
qsphy* at mii? # Quality Semi QS6612 PHYs
luphy* at mii? # Lucent LU6612 PHY