summaryrefslogtreecommitdiff
path: root/sys/arch/i386/conf/GENERIC
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2008-09-29 13:13:36 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2008-09-29 13:13:36 +0000
commit0ad2499d43626ae45a59f62eb365a9daf5bb18ee (patch)
tree033fe5d99126a77163e37b4c05bb30b4a425189f /sys/arch/i386/conf/GENERIC
parent21894d13b1988e83e55f308cff2676cc8dbac17a (diff)
enable JMicron Ethernet (jme/jmphy)
Diffstat (limited to 'sys/arch/i386/conf/GENERIC')
-rw-r--r--sys/arch/i386/conf/GENERIC4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 94906d0a2e6..9b70ae3caf2 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.633 2008/08/02 16:09:29 oga Exp $
+# $OpenBSD: GENERIC,v 1.634 2008/09/29 13:13:35 jsg Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -585,6 +585,7 @@ gem* at pci? # Sun 'gem' ethernet
vic* at pci? # VMware VMXnet virtual interface
et* at pci? # Agere/LSI ET1310
lii* at pci? # Attansic L2 Ethernet
+jme* at pci? # JMicron JMC250/JMC260 Ethernet
# Wireless network cards
acx* at pci? # TI ACX100/ACX111 (802.11b/g)
@@ -644,6 +645,7 @@ rgephy* at mii? # Realtek 8169S/8110S PHY
ciphy* at mii? # Cicada CS8201 10/100/1000 copper PHY
gentbi* at mii? # Generic 1000BASE-X ten-bit PHY
etphy* at mii? # Agere/LSI ET1011 TruePHY
+jmphy* at mii? # JMicron JMP202/JMP211 PHYs
ukphy* at mii? # "unknown" PHYs
pss0 at isa? port 0x220 irq 7 drq 6 # Personal Sound System