diff options
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 3 | ||||
| -rw-r--r-- | sys/arch/i386/i386/conf.c | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 802adfd1a81..bf1b228af03 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.783 2014/08/15 14:06:48 mikeb Exp $ +# $OpenBSD: GENERIC,v 1.784 2014/08/20 06:14:42 mikeb Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -784,7 +784,6 @@ pseudo-device hotplug 1 # devices hot plugging # mouse & keyboard multiplexor pseudo-devices pseudo-device wsmux 2 -pseudo-device crypto 1 # Virtio devices virtio* at pci? # Virtio PCI device diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c index a0e406e2637..6ea85163cb3 100644 --- a/sys/arch/i386/i386/conf.c +++ b/sys/arch/i386/i386/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.146 2014/03/14 23:42:40 kettenis Exp $ */ +/* $OpenBSD: conf.c,v 1.147 2014/08/20 06:14:42 mikeb Exp $ */ /* $NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $ */ /* @@ -41,8 +41,6 @@ #include <machine/conf.h> -#include "inet.h" - #include "wd.h" bdev_decl(wd); #include "fdc.h" @@ -260,7 +258,7 @@ struct cdevsw cdevsw[] = cdev_mouse_init(NWSMOUSE, /* 68: mice */ wsmouse), cdev_mouse_init(NWSMUX, wsmux), /* 69: ws multiplexor */ - cdev_crypto_init(NCRYPTO,crypto), /* 70: /dev/crypto */ + cdev_notdef(), /* 70: was: /dev/crypto */ cdev_tty_init(NCZ,cztty), /* 71: Cyclades-Z serial port */ #ifdef USER_PCICONF cdev_pci_init(NPCI,pci), /* 72: PCI user */ |