summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2011-01-12 22:16:20 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2011-01-12 22:16:20 +0000
commit2181d37d0f964c2c4b13df0c1e9cb79aaab83f63 (patch)
tree19f646af840b82a06cf935a337a059413408b8ea /sys
parente3b54548057786d0475e0a053dae358d96bf7a70 (diff)
Add crypto(4) and hifn(4).
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/socppc/conf/GENERIC4
-rw-r--r--sys/arch/socppc/socppc/conf.c6
2 files changed, 7 insertions, 3 deletions
diff --git a/sys/arch/socppc/conf/GENERIC b/sys/arch/socppc/conf/GENERIC
index 4485dd6ed50..ca407f55d0a 100644
--- a/sys/arch/socppc/conf/GENERIC
+++ b/sys/arch/socppc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.20 2011/01/08 11:56:30 damien Exp $
+# $OpenBSD: GENERIC,v 1.21 2011/01/12 22:16:19 kettenis Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -104,6 +104,8 @@ ukphy* at mii? # Generic unknown PHY
# PCI
athn* at pci? # Atheros AR9k (802.11a/g/n)
+hifn* at pci? # Hi/fn 7751 crypto card
+pseudo-device crypto 1 # hardware crypto access
pseudo-device hotplug 1 # devices hot plugging
pseudo-device wsmux 2 # mouse & keyboard multiplexor
diff --git a/sys/arch/socppc/socppc/conf.c b/sys/arch/socppc/socppc/conf.c
index 6cb234c321f..67698461197 100644
--- a/sys/arch/socppc/socppc/conf.c
+++ b/sys/arch/socppc/socppc/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.12 2010/11/19 20:55:48 miod Exp $ */
+/* $OpenBSD: conf.c,v 1.13 2011/01/12 22:16:19 kettenis Exp $ */
/*
* Copyright (c) 1997 Per Fogelstrom
@@ -89,6 +89,8 @@ cdev_decl(com);
#include "tun.h"
+#include "inet.h"
+
#include "wsmux.h"
#ifdef USER_PCICONF
@@ -168,7 +170,7 @@ struct cdevsw cdevsw[] = {
cdev_video_init(NVIDEO,video), /* 44: generic video I/O */
cdev_notdef(), /* 45 */
cdev_notdef(), /* 46 */
- cdev_notdef(), /* 47 */
+ cdev_crypto_init(NCRYPTO,crypto), /* 47: /dev/crypto */
cdev_notdef(), /* 48 */
cdev_notdef(), /* 49 */
cdev_systrace_init(NSYSTRACE,systrace), /* 50 system call tracing */