summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/alpha/conf/GENERIC4
-rw-r--r--sys/arch/amd64/conf/GENERIC4
-rw-r--r--sys/arch/i386/conf/GENERIC4
-rw-r--r--sys/arch/macppc/conf/GENERIC3
-rw-r--r--sys/arch/sgi/conf/GENERIC-IP273
-rw-r--r--sys/arch/sgi/conf/GENERIC-IP303
-rw-r--r--sys/arch/sgi/conf/GENERIC-IP323
-rw-r--r--sys/arch/sparc64/conf/GENERIC4
8 files changed, 8 insertions, 20 deletions
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index dc36ccda1e2..7b0c7900d61 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.245 2014/07/12 21:56:56 tedu Exp $
+# $OpenBSD: GENERIC,v 1.246 2014/08/15 14:06:47 mikeb Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -414,8 +414,6 @@ wsmouse* at pms? mux 0
# crypto support
hifn* at pci? # Hi/fn 7751 crypto card
-lofn* at pci? # Hi/fn 6500 crypto card
-nofn* at pci? # Hi/fn 7814/7851/7854 crypto card
ubsec* at pci? # Bluesteel Networks 5xxx crypto card
safe* at pci? # SafeNet SafeXcel 1141/1741
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index d9808635a14..8683a826a1e 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.373 2014/07/13 22:28:04 miod Exp $
+# $OpenBSD: GENERIC,v 1.374 2014/08/15 14:06:48 mikeb Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -584,8 +584,6 @@ radio* at bktr?
# crypto support
hifn* at pci? # Hi/fn 7751 crypto card
-lofn* at pci? # Hi/fn 6500 crypto card
-nofn* at pci? # Hi/fn 7814/7851/7854 crypto card
ubsec* at pci? # Bluesteel Networks 5xxx crypto card
safe* at pci? # SafeNet SafeXcel 1141/1741
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 41504185de3..802adfd1a81 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.782 2014/07/13 22:28:03 miod Exp $
+# $OpenBSD: GENERIC,v 1.783 2014/08/15 14:06:48 mikeb Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -759,8 +759,6 @@ joy* at isapnp?
# crypto support
hifn* at pci? # Hi/fn 7751 crypto card
-lofn* at pci? # Hi/fn 6500 crypto card
-nofn* at pci? # Hi/fn 7814/7851/7854 crypto card
ubsec* at pci? # Bluesteel Networks 5xxx crypto card
safe* at pci? # SafeNet SafeXcel 1141/1741
glxsb* at pci? # AMD Geode LX series processor security block
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index 83201165bab..6d35ffe7787 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.238 2014/08/03 17:52:10 stsp Exp $g
+# $OpenBSD: GENERIC,v 1.239 2014/08/15 14:06:48 mikeb Exp $g
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -133,7 +133,6 @@ ipgphy* at mii? # IC Plus IP1000A PHYs
ukphy* at mii? # generic unknown PHYs
# crypto
-lofn* at pci? # Hifn6500
hifn* at pci? # Hifn7751/7811/7951
ubsec* at pci? # Broadcom 58xx
safe* at pci? # SafeNet SafeXcel 1141/1741
diff --git a/sys/arch/sgi/conf/GENERIC-IP27 b/sys/arch/sgi/conf/GENERIC-IP27
index bfeaa142dd1..c2cc719898a 100644
--- a/sys/arch/sgi/conf/GENERIC-IP27
+++ b/sys/arch/sgi/conf/GENERIC-IP27
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC-IP27,v 1.53 2014/04/07 08:27:24 brad Exp $
+# $OpenBSD: GENERIC-IP27,v 1.54 2014/08/15 14:06:48 mikeb Exp $
#
# THIS KERNEL IS FOR Origin, Onyx, Fuel, Tezro (IP27, IP35) SYSTEMS ONLY.
#
@@ -266,7 +266,6 @@ ses* at scsibus?
uk* at scsibus?
#### Crypto devices
-lofn* at pci? # Hifn6500
hifn* at pci? # Hifn7751/7811/7951
ubsec* at pci? # Broadcom 58xx
diff --git a/sys/arch/sgi/conf/GENERIC-IP30 b/sys/arch/sgi/conf/GENERIC-IP30
index 330e7f4841d..210298fc91a 100644
--- a/sys/arch/sgi/conf/GENERIC-IP30
+++ b/sys/arch/sgi/conf/GENERIC-IP30
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC-IP30,v 1.46 2014/04/07 08:27:24 brad Exp $
+# $OpenBSD: GENERIC-IP30,v 1.47 2014/08/15 14:06:48 mikeb Exp $
#
# THIS KERNEL IS FOR Octane and Octane 2 (IP30) SYSTEMS ONLY.
#
@@ -257,7 +257,6 @@ ses* at scsibus?
uk* at scsibus?
#### Crypto devices
-lofn* at pci? # Hifn6500
hifn* at pci? # Hifn7751/7811/7951
ubsec* at pci? # Broadcom 58xx
diff --git a/sys/arch/sgi/conf/GENERIC-IP32 b/sys/arch/sgi/conf/GENERIC-IP32
index 02603e5534f..d122f70059a 100644
--- a/sys/arch/sgi/conf/GENERIC-IP32
+++ b/sys/arch/sgi/conf/GENERIC-IP32
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC-IP32,v 1.37 2014/04/07 08:27:24 brad Exp $
+# $OpenBSD: GENERIC-IP32,v 1.38 2014/08/15 14:06:48 mikeb Exp $
#
# THIS KERNEL IS FOR O2 (IP32) SYSTEMS ONLY.
#
@@ -253,7 +253,6 @@ ses* at scsibus?
uk* at scsibus?
#### Crypto devices
-lofn* at pci? # Hifn6500
hifn* at pci? # Hifn7751/7811/7951
ubsec* at pci? # Broadcom 58xx
diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC
index fd51924c2f9..8e1594dcd04 100644
--- a/sys/arch/sparc64/conf/GENERIC
+++ b/sys/arch/sparc64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.288 2014/07/12 21:56:56 tedu Exp $
+# $OpenBSD: GENERIC,v 1.289 2014/08/15 14:06:48 mikeb Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -128,8 +128,6 @@ sili* at pci? # Silicon Image 3124/3132/3531 SATA controllers
# PCI crypto
hifn* at pci? # Hifn 7751/7811/7951
-#nofn* at pci? # Hifn 7814/7851/7854
-lofn* at pci? # Hifn 6500
ubsec* at pci? # Broadcom 580[125]/582[012]
# PCI sound