diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2006-11-06 03:35:00 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2006-11-06 03:35:00 +0000 |
| commit | eb74a369c8f72096ee10551e85932d5f795565ef (patch) | |
| tree | fa586428bd5cb4ab484c2401367725437347b16a /sys | |
| parent | c5123ce177affe957a51776a9359791ed8c71f2f (diff) | |
add gem and gentbi; why not
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/amd64/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index a0fc1fcd447..e8ce25f8dd4 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.163 2006/10/26 04:14:09 jsg Exp $ +# $OpenBSD: GENERIC,v 1.164 2006/11/06 03:34:59 deraadt Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -367,6 +367,7 @@ nfe* at pci? # NVIDIA nForce Ethernet musycc* at pci? # Conexant HDLC controller art* at musycc? # Accoom Artery E1/T1 cards xge* at pci? # Neterion Xframe-I/II 10Gb ethernet +gem* at pci? # Sun 'gem' ethernet bce* at pci? # Broadcom BCM4401 # Wireless network cards @@ -416,6 +417,7 @@ nsgphy* at mii? # NS gigabit PHYs rgephy* at mii? # Realtek 8169S/8110S PHY 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 ukphy* at mii? # "unknown" PHYs eap* at pci? # Ensoniq AudioPCI S5016 diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index fcea8af80a8..02796f6a9b3 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.531 2006/11/02 20:45:17 dlg Exp $ +# $OpenBSD: GENERIC,v 1.532 2006/11/06 03:34:59 deraadt Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -508,6 +508,7 @@ nfe* at pci? # NVIDIA nForce Ethernet musycc* at pci? # Conexant HDLC controller art* at musycc? # Accoom Artery E1/T1 cards xge* at pci? # Neterion Xframe-I/II 10Gb ethernet +gem* at pci? # Sun 'gem' ethernet vic* at pci? # VMware VMXnet virtual interface # Wireless network cards @@ -560,6 +561,7 @@ nsgphy* at mii? # NS gigabit PHYs urlphy* at mii? # Realtek RTL8150L internal PHY 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 ukphy* at mii? # "unknown" PHYs pss0 at isa? port 0x220 irq 7 drq 6 # Personal Sound System |