summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Smith <brad@cvs.openbsd.org>2014-11-16 05:33:59 +0000
committerBrad Smith <brad@cvs.openbsd.org>2014-11-16 05:33:59 +0000
commit61e1196fdb81aea69ad95901900646b1d2149bc3 (patch)
treef3fe5507cf30ad151876abf6247d5b1b6b5aa68c
parent932620af828c7056d2d0a36584cbb4e53eee639d (diff)
Add cas(4).
ok deraadt@
-rw-r--r--sys/arch/amd64/conf/GENERIC5
-rw-r--r--sys/arch/i386/conf/GENERIC5
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