summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2014-08-22 20:03:57 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2014-08-22 20:03:57 +0000
commit5222b9a527d31516f9eefa830b8ad96a5f957ad7 (patch)
treef53c31cf9113c12ab8f29c8710846efe4c9f5b58
parentd5e7a97e1c6cffea29c774bdef80b0e2c04541b3 (diff)
pseudo-device crypto was accidentally left for some architectures.
Diffstat
-rw-r--r--sys/arch/armish/conf/RAMDISK3
-rw-r--r--sys/arch/armv7/conf/RAMDISK-IMX3
-rw-r--r--sys/arch/armv7/conf/RAMDISK-OMAP3
-rw-r--r--sys/arch/armv7/conf/RAMDISK-SUNXI3
-rw-r--r--sys/arch/landisk/conf/RAMDISK3
-rw-r--r--sys/arch/sgi/conf/GENERIC-IP223
-rw-r--r--sys/arch/sgi/conf/GENERIC-IP263
-rw-r--r--sys/arch/sgi/conf/GENERIC-IP273
-rw-r--r--sys/arch/sgi/conf/GENERIC-IP283
-rw-r--r--sys/arch/sgi/conf/GENERIC-IP303
-rw-r--r--sys/arch/sgi/conf/GENERIC-IP323
-rw-r--r--sys/arch/zaurus/conf/RAMDISK3
12 files changed, 12 insertions, 24 deletions
diff --git a/sys/arch/armish/conf/RAMDISK b/sys/arch/armish/conf/RAMDISK
index 0b09b59b7e1..9ac60e980e3 100644
--- a/sys/arch/armish/conf/RAMDISK
+++ b/sys/arch/armish/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.29 2014/07/12 21:56:56 tedu Exp $
+# $OpenBSD: RAMDISK,v 1.30 2014/08/22 20:03:54 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -173,7 +173,6 @@ ukphy* at mii? # generic unknown PHYs
# mouse & keyboard multiplexor pseudo-devices
pseudo-device wsmux 2
-pseudo-device crypto 1
pseudo-device bio 1 # ioctl multiplexing device
pseudo-device hotplug 1 # devices hot plugging
diff --git a/sys/arch/armv7/conf/RAMDISK-IMX b/sys/arch/armv7/conf/RAMDISK-IMX
index de3d3905f05..e297d4b2f6b 100644
--- a/sys/arch/armv7/conf/RAMDISK-IMX
+++ b/sys/arch/armv7/conf/RAMDISK-IMX
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK-IMX,v 1.10 2014/07/12 21:56:56 tedu Exp $
+# $OpenBSD: RAMDISK-IMX,v 1.11 2014/08/22 20:03:56 deraadt Exp $
#
# GENERIC machine description file
#
@@ -154,7 +154,6 @@ iic* at imxiic?
# Pseudo-Devices
#pseudo-device wsmux 2 # mouse & keyboard multiplexor
-#pseudo-device crypto 1
pseudo-device loop 1 # network loopback
pseudo-device bpfilter 1 # packet filter
pseudo-device rd 1 # ram disk
diff --git a/sys/arch/armv7/conf/RAMDISK-OMAP b/sys/arch/armv7/conf/RAMDISK-OMAP
index f8fb8be2d47..c2d08b2044b 100644
--- a/sys/arch/armv7/conf/RAMDISK-OMAP
+++ b/sys/arch/armv7/conf/RAMDISK-OMAP
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK-OMAP,v 1.8 2014/07/12 21:56:56 tedu Exp $
+# $OpenBSD: RAMDISK-OMAP,v 1.9 2014/08/22 20:03:56 deraadt Exp $
#
# GENERIC machine description file
#
@@ -178,7 +178,6 @@ sdmmc* at ommmc? # SD/MMC bus
# Pseudo-Devices
#pseudo-device wsmux 2 # mouse & keyboard multiplexor
-#pseudo-device crypto 1
pseudo-device loop 1 # network loopback
pseudo-device bpfilter 1 # packet filter
pseudo-device rd 1 # ram disk
diff --git a/sys/arch/armv7/conf/RAMDISK-SUNXI b/sys/arch/armv7/conf/RAMDISK-SUNXI
index 16c244253ac..69feda1a0a4 100644
--- a/sys/arch/armv7/conf/RAMDISK-SUNXI
+++ b/sys/arch/armv7/conf/RAMDISK-SUNXI
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK-SUNXI,v 1.8 2014/07/12 21:56:56 tedu Exp $
+# $OpenBSD: RAMDISK-SUNXI,v 1.9 2014/08/22 20:03:56 deraadt Exp $
#
# GENERIC machine description file
#
@@ -148,7 +148,6 @@ uk* at scsibus?
# Pseudo-Devices
#pseudo-device wsmux 2 # mouse & keyboard multiplexor
-#pseudo-device crypto 1
pseudo-device loop 1 # network loopback
pseudo-device bpfilter 1 # packet filter
pseudo-device rd 1 # ram disk
diff --git a/sys/arch/landisk/conf/RAMDISK b/sys/arch/landisk/conf/RAMDISK
index ae317a01539..52cc99639ba 100644
--- a/sys/arch/landisk/conf/RAMDISK
+++ b/sys/arch/landisk/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.21 2014/07/12 21:56:56 tedu Exp $
+# $OpenBSD: RAMDISK,v 1.22 2014/08/22 20:03:56 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -120,7 +120,6 @@ cd* at scsibus? # SCSI CD-ROM drives
# mouse & keyboard multiplexor pseudo-devices
pseudo-device wsmux 2
-#pseudo-device crypto 1
#pseudo-device bio 1 # ioctl multiplexing device
#pseudo-device hotplug 1 # devices hot plugging
diff --git a/sys/arch/sgi/conf/GENERIC-IP22 b/sys/arch/sgi/conf/GENERIC-IP22
index bbfaa29b495..27f984cd0b9 100644
--- a/sys/arch/sgi/conf/GENERIC-IP22
+++ b/sys/arch/sgi/conf/GENERIC-IP22
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC-IP22,v 1.15 2012/07/18 19:56:02 miod Exp $
+# $OpenBSD: GENERIC-IP22,v 1.16 2014/08/22 20:03:56 deraadt Exp $
#
# THIS KERNEL IS FOR INDIGO (IP20), INDY (IP22) AND INDIGO2 (IP24) SYSTEMS ONLY.
#
@@ -103,6 +103,5 @@ safte* at scsibus?
ses* at scsibus?
uk* at scsibus?
-pseudo-device crypto 1
#pseudo-device hotplug 1 # devices hot plugging
pseudo-device wsmux 2 # Mouse and keyboard multiplexor
diff --git a/sys/arch/sgi/conf/GENERIC-IP26 b/sys/arch/sgi/conf/GENERIC-IP26
index 6f27c2d8eb4..b26419b1b53 100644
--- a/sys/arch/sgi/conf/GENERIC-IP26
+++ b/sys/arch/sgi/conf/GENERIC-IP26
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC-IP26,v 1.1 2012/09/29 21:46:02 miod Exp $
+# $OpenBSD: GENERIC-IP26,v 1.2 2014/08/22 20:03:56 deraadt Exp $
#
# THIS KERNEL IS FOR POWER INDIGO2 R8000 (IP26) SYSTEMS ONLY.
#
@@ -85,6 +85,5 @@ safte* at scsibus?
ses* at scsibus?
uk* at scsibus?
-pseudo-device crypto 1
#pseudo-device hotplug 1 # devices hot plugging
pseudo-device wsmux 2 # Mouse and keyboard multiplexor
diff --git a/sys/arch/sgi/conf/GENERIC-IP27 b/sys/arch/sgi/conf/GENERIC-IP27
index c2cc719898a..dda9b82af01 100644
--- a/sys/arch/sgi/conf/GENERIC-IP27
+++ b/sys/arch/sgi/conf/GENERIC-IP27
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC-IP27,v 1.54 2014/08/15 14:06:48 mikeb Exp $
+# $OpenBSD: GENERIC-IP27,v 1.55 2014/08/22 20:03:56 deraadt Exp $
#
# THIS KERNEL IS FOR Origin, Onyx, Fuel, Tezro (IP27, IP35) SYSTEMS ONLY.
#
@@ -277,6 +277,5 @@ com* at puc?
com* at pcmcia?
com* at cardbus?
-pseudo-device crypto 1
pseudo-device hotplug 1 # devices hot plugging
pseudo-device wsmux 2 # Mouse and keyboard multiplexor
diff --git a/sys/arch/sgi/conf/GENERIC-IP28 b/sys/arch/sgi/conf/GENERIC-IP28
index 72a13b3d69a..76523f0d477 100644
--- a/sys/arch/sgi/conf/GENERIC-IP28
+++ b/sys/arch/sgi/conf/GENERIC-IP28
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC-IP28,v 1.3 2012/07/14 19:53:27 miod Exp $
+# $OpenBSD: GENERIC-IP28,v 1.4 2014/08/22 20:03:56 deraadt Exp $
#
# THIS KERNEL IS FOR POWER INDIGO2 R10000 (IP28) SYSTEMS ONLY.
#
@@ -84,6 +84,5 @@ safte* at scsibus?
ses* at scsibus?
uk* at scsibus?
-pseudo-device crypto 1
#pseudo-device hotplug 1 # devices hot plugging
pseudo-device wsmux 2 # Mouse and keyboard multiplexor
diff --git a/sys/arch/sgi/conf/GENERIC-IP30 b/sys/arch/sgi/conf/GENERIC-IP30
index 210298fc91a..9da4bca0728 100644
--- a/sys/arch/sgi/conf/GENERIC-IP30
+++ b/sys/arch/sgi/conf/GENERIC-IP30
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC-IP30,v 1.47 2014/08/15 14:06:48 mikeb Exp $
+# $OpenBSD: GENERIC-IP30,v 1.48 2014/08/22 20:03:56 deraadt Exp $
#
# THIS KERNEL IS FOR Octane and Octane 2 (IP30) SYSTEMS ONLY.
#
@@ -268,6 +268,5 @@ com* at puc?
com* at pcmcia?
com* at cardbus?
-pseudo-device crypto 1
pseudo-device hotplug 1 # devices hot plugging
pseudo-device wsmux 2 # Mouse and keyboard multiplexor
diff --git a/sys/arch/sgi/conf/GENERIC-IP32 b/sys/arch/sgi/conf/GENERIC-IP32
index d122f70059a..2c9a80c1f01 100644
--- a/sys/arch/sgi/conf/GENERIC-IP32
+++ b/sys/arch/sgi/conf/GENERIC-IP32
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC-IP32,v 1.38 2014/08/15 14:06:48 mikeb Exp $
+# $OpenBSD: GENERIC-IP32,v 1.39 2014/08/22 20:03:56 deraadt Exp $
#
# THIS KERNEL IS FOR O2 (IP32) SYSTEMS ONLY.
#
@@ -264,6 +264,5 @@ com* at puc?
com* at pcmcia?
com* at cardbus?
-pseudo-device crypto 1
pseudo-device hotplug 1 # devices hot plugging
pseudo-device wsmux 2 # Mouse and keyboard multiplexor
diff --git a/sys/arch/zaurus/conf/RAMDISK b/sys/arch/zaurus/conf/RAMDISK
index df8eb1e4b75..a4b721ee2b0 100644
--- a/sys/arch/zaurus/conf/RAMDISK
+++ b/sys/arch/zaurus/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.49 2014/07/12 21:56:57 tedu Exp $
+# $OpenBSD: RAMDISK,v 1.50 2014/08/22 20:03:56 deraadt Exp $
machine zaurus arm
@@ -161,7 +161,6 @@ apm0 at pxaip?
# Pseudo-Devices
pseudo-device wsmux 2 # mouse & keyboard multiplexor
-#pseudo-device crypto 1
pseudo-device loop 1 # network loopback
pseudo-device bpfilter 1 # packet filter
pseudo-device rd 1 # ram disk
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 23:51:57 +0000