diff options
| author |   jsg <jsg@openbsd.org> | 2008-09-29 13:13:35 +0000 |
|---|---|---|
| committer | jsg <jsg@openbsd.org> | 2008-09-29 13:13:35 +0000 |
| commit | 089106e421e481fa91333161f1302251dfb4cf7e (patch) | |
| tree | c21aa833f09f1d7d5a8c89fa986a5607800755ed | |
| parent | Use pools to do allocations for all sizes <= PAGE_SIZE. (diff) | |
| download | wireguard-openbsd-089106e421e481fa91333161f1302251dfb4cf7e.tar.xz wireguard-openbsd-089106e421e481fa91333161f1302251dfb4cf7e.zip | |
enable JMicron Ethernet (jme/jmphy)
| -rw-r--r-- | sys/arch/amd64/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/arch/amd64/conf/RAMDISK_CD | 4 | ||||
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/arch/i386/conf/RAMDISK_CD | 4 |
4 files changed, 12 insertions, 4 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index 1902549dc6e..02100db8da2 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.240 2008/08/02 16:09:29 oga Exp $ +# $OpenBSD: GENERIC,v 1.241 2008/09/29 13:13:35 jsg Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -427,6 +427,7 @@ gem* at pci? # Sun 'gem' ethernet bce* at pci? # Broadcom BCM4401 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) @@ -483,6 +484,7 @@ urlphy* at mii? # Realtek RTL8150L internal 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 eap* at pci? # Ensoniq AudioPCI S5016 diff --git a/sys/arch/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD index a9baaf627e2..81ecb895025 100644 --- a/sys/arch/amd64/conf/RAMDISK_CD +++ b/sys/arch/amd64/conf/RAMDISK_CD @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK_CD,v 1.89 2008/07/02 22:14:07 todd Exp $ +# $OpenBSD: RAMDISK_CD,v 1.90 2008/09/29 13:13:35 jsg Exp $ machine amd64 # architecture, used by config; REQUIRED @@ -278,6 +278,7 @@ 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 +jme* at pci? # JMicron JMC250/JMC260 Ethernet # Wireless network cards acx* at pci? # TI ACX100/ACX111 (802.11b/g) @@ -331,6 +332,7 @@ 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 +jmphy* at mii? # JMicron JMP202/JMP211 PHYs ukphy* at mii? # "unknown" PHYs pseudo-device loop 1 # network loopback 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 diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD index df9ed1b7de4..ca1309f9885 100644 --- a/sys/arch/i386/conf/RAMDISK_CD +++ b/sys/arch/i386/conf/RAMDISK_CD @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK_CD,v 1.158 2008/07/02 22:14:07 todd Exp $ +# $OpenBSD: RAMDISK_CD,v 1.159 2008/09/29 13:13:35 jsg Exp $ machine i386 # architecture, used by config; REQUIRED @@ -364,6 +364,7 @@ xge* at pci? # Neterion Xframe-I/II 10Gb 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) @@ -416,6 +417,7 @@ 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 +jmphy* at mii? # JMicron JMP202/JMP211 PHYs ukphy* at mii? # "unknown" PHYs pseudo-device loop 1 # network loopback |