diff options
| author |   brad <brad@openbsd.org> | 2014-11-16 05:33:58 +0000 |
|---|---|---|
| committer | brad <brad@openbsd.org> | 2014-11-16 05:33:58 +0000 |
| commit | 6c69c7f5c98c12dd9f3ddc6faedc7a9dfe1986a4 (patch) | |
| tree | b4b198c32efd66fe22a1fdd7b2aa5d0cd8993724 /sys | |
| parent | Don't restart syscalls on SIGTHR. When a cancellation happens, we need to (diff) | |
| download | wireguard-openbsd-6c69c7f5c98c12dd9f3ddc6faedc7a9dfe1986a4.tar.xz wireguard-openbsd-6c69c7f5c98c12dd9f3ddc6faedc7a9dfe1986a4.zip | |
Add cas(4).
ok deraadt@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/amd64/conf/GENERIC | 5 | ||||
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index ec77d7b2419..c08e649e74c 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.377 2014/11/07 16:44:17 mpi Exp $ +# $OpenBSD: GENERIC,v 1.378 2014/11/16 05:33:58 brad Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -446,7 +446,8 @@ nfe* at pci? # NVIDIA nForce Ethernet xge* at pci? # Neterion Xframe-I/II 10Gb ethernet thtc* at pci? # Tehuti Networks 10Gb ethernet tht* at thtc? -gem* at pci? # Sun 'gem' ethernet +gem* at pci? # Sun GEM 10/100/Gigabit +cas* at pci? # Sun Cassini 100/Gigabit bce* at pci? # Broadcom BCM4401 vic* at pci? # VMware VMXnet virtual interface vmx* at pci? # VMware VMXNET3 virtual interface diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index e9b926d6bc7..cb3d96a8b73 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.787 2014/11/07 16:44:17 mpi Exp $ +# $OpenBSD: GENERIC,v 1.788 2014/11/16 05:33:58 brad Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -581,7 +581,8 @@ nfe* at pci? # NVIDIA nForce Ethernet xge* at pci? # Neterion Xframe-I/II 10Gb ethernet thtc* at pci? # Tehuti Networks 10Gb ethernet tht* at thtc? -gem* at pci? # Sun 'gem' ethernet +gem* at pci? # Sun GEM 10/100/Gigabit +cas* at pci? # Sun Cassini 100/Gigabit vic* at pci? # VMware VMXnet virtual interface vmx* at pci? # VMware VMXNET3 virtual interface et* at pci? # Agere/LSI ET1310 |