summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2008-09-29 22:43:59 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2008-09-29 22:43:59 +0000
commit23072936ecea224e6d49c2134f7820b6cfd28f93 (patch)
tree0af2eae8ef73fdc860bcc3169a1cec1bad37b7dc /sys
parent9ecf3ed8cfbf5347762426cc1a3e9d98947f579e (diff)
jme(4) works on sparc64; ok jsg
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/sparc64/conf/GENERIC4
-rw-r--r--sys/arch/sparc64/conf/RAMDISK4
2 files changed, 6 insertions, 2 deletions
diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC
index f992dd0742f..ac71c285e0a 100644
--- a/sys/arch/sparc64/conf/GENERIC
+++ b/sys/arch/sparc64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.220 2008/08/28 10:21:22 mikeb Exp $
+# $OpenBSD: GENERIC,v 1.221 2008/09/29 22:43:58 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -90,6 +90,7 @@ musycc* at pci? # Conexant HDLC controller
art* at musycc? # Accoom Artery E1/T1 cards
thtc* at pci? # Tehuti Networks 10Gb ethernet
tht* at thtc?
+jme* at pci? # JMicron JMC250/JMC260 Ethernet
ath* at pci? # Atheros AR5k (802.11a/b/g)
ath* at cardbus? # Atheros AR5k (802.11a/b/g)
@@ -423,6 +424,7 @@ rgephy* at mii? # Realtek 8169S/8110S PHY
gentbi* at mii? # Generic 1000BASE-X ten-bit PHY
nsgphy* at mii? # NS gigabit PHYs
tqphy* at mii? # TDK 78Q212x PHYs
+jmphy* at mii? # JMicron JMP202/JMP211 PHYs
ukphy* at mii? # Unknown PHYs
# sensors
diff --git a/sys/arch/sparc64/conf/RAMDISK b/sys/arch/sparc64/conf/RAMDISK
index 43a5b8c8aa4..d3be57879ec 100644
--- a/sys/arch/sparc64/conf/RAMDISK
+++ b/sys/arch/sparc64/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.77 2008/08/24 20:13:21 deraadt Exp $
+# $OpenBSD: RAMDISK,v 1.78 2008/09/29 22:43:58 deraadt Exp $
# Machine architecture; required by config(8)
machine sparc64
@@ -110,6 +110,7 @@ rl* at pci? # RealTek 81[23]9 ethernet
vr* at pci? # VIA Rhine ethernet
re* at pci? # RealTek 8169/8169S/8110S
re* at cardbus? # RealTek 8169/8169S/8110S
+jme* at pci? # JMicron JMC250/JMC260 Ethernet
auxio* at ebus?
auxio* at sbus?
@@ -207,6 +208,7 @@ urlphy* at mii? # Realtek RTL8150L internal PHY
rgephy* at mii? # Realtek 8169S/8110S PHY
gentbi* at mii? # Generic 1000BASE-X ten-bit PHY
nsgphy* at mii? # NS gigabit PHYs
+jmphy* at mii? # JMicron JMP202/JMP211 PHYs
ukphy* at mii? # Unknown PHYs
# PCI USB Controllers