summaryrefslogtreecommitdiff
path: root/sys/arch/octeon
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2010-11-19 20:55:49 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2010-11-19 20:55:49 +0000
commit0fe2c4673be6244e907b333d32292a90852fcb0f (patch)
treebbd054b963fcfd95d6c4ae8d8bdea140167d83d8 /sys/arch/octeon
parent6a986e8479d7aaf39bf85f818e98abdcdebf9fae (diff)
Sync MAKEDEV against conf.c, and both against GENERIC.
Diffstat (limited to 'sys/arch/octeon')
-rw-r--r--sys/arch/octeon/octeon/conf.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/arch/octeon/octeon/conf.c b/sys/arch/octeon/octeon/conf.c
index 7ff5d2fbba3..ade4586fec4 100644
--- a/sys/arch/octeon/octeon/conf.c
+++ b/sys/arch/octeon/octeon/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.3 2010/10/26 00:02:01 syuu Exp $ */
+/* $OpenBSD: conf.c,v 1.4 2010/11/19 20:55:48 miod Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -137,6 +137,7 @@ cdev_decl(pci);
#include "ulpt.h"
#include "urio.h"
#include "ucom.h"
+#include "uscanner.h"
#include "bthub.h"
#include "vscsi.h"
@@ -228,6 +229,7 @@ struct cdevsw cdevsw[] =
cdev_vscsi_init(NVSCSI,vscsi), /* 69: vscsi */
cdev_disk_init(1,diskmap), /* 70: disk mapper */
cdev_pppx_init(NPPPX,pppx), /* 71: pppx */
+ cdev_usbdev_init(NUSCANNER,uscanner), /* 72: USB scanners */
};
int nchrdev = sizeof (cdevsw) / sizeof (cdevsw[0]);