more fuse in more places. credit: miod

7 files changed, 21 insertions, 12 deletions

diff --git a/sys/arch/arm/arm/conf.c b/sys/arch/arm/arm/conf.c
index 98e24c7c3d2..cfadb9d09fe 100644
--- a/sys/arch/arm/arm/conf.c
+++ b/sys/arch/arm/arm/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.34 2013/03/15 09:10:52 ratchov Exp $	*/
+/*	$OpenBSD: conf.c,v 1.35 2013/06/03 17:33:58 tedu Exp $	*/
 /*	$NetBSD: conf.c,v 1.10 2002/04/19 01:04:38 wiz Exp $	*/
 
 /*
@@ -267,6 +267,7 @@ struct bdevsw bdevsw[] = {
 #include "hotplug.h"
 #include "vscsi.h"
 #include "pppx.h"
+#include "fuse.h"
 
 #ifdef CONF_HAVE_GPIO
 #include "gpio.h"
@@ -358,7 +359,7 @@ struct cdevsw cdevsw[] = {
 	cdev_lkm_dummy(),			/* 74: reserved */
 	cdev_lkm_dummy(),			/* 75: reserved */
 	cdev_lkm_dummy(),			/* 76: reserved */
-	cdev_notdef(),                          /* 77: removed device */
+	cdev_fuse_init(NFUSE,fuse),		/* 77: fuse */
 	cdev_notdef(),                          /* 78: removed device */
 	cdev_notdef(),                          /* 79: removed device */
 	cdev_notdef(),                          /* 80: removed device */
diff --git a/sys/arch/aviion/aviion/conf.c b/sys/arch/aviion/aviion/conf.c
index a9470fb9800..7e6940bbb10 100644
--- a/sys/arch/aviion/aviion/conf.c
+++ b/sys/arch/aviion/aviion/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.16 2012/08/23 06:12:49 deraadt Exp $	*/
+/*	$OpenBSD: conf.c,v 1.17 2013/06/03 17:33:58 tedu Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -59,6 +59,7 @@
 #include "vnd.h"
 #include "vscsi.h"
 #include "pppx.h"
+#include "fuse.h"
 
 struct bdevsw	bdevsw[] =
 {
@@ -131,7 +132,7 @@ struct cdevsw	cdevsw[] =
 	cdev_notdef(),			/* 42 */
 	cdev_ksyms_init(NKSYMS,ksyms),	/* 43: Kernel symbols device */
 	cdev_ch_init(NCH,ch),		/* 44: SCSI autochanger */
-	cdev_notdef(),			/* 45 */
+	cdev_fuse_init(NFUSE,fuse),	/* 45: fuse */
 	cdev_notdef(),			/* 46 */
 	cdev_notdef(),			/* 47 */
 	cdev_notdef(),			/* 48 */
diff --git a/sys/arch/luna88k/luna88k/conf.c b/sys/arch/luna88k/luna88k/conf.c
index b4b89d69f6e..b9aa86dd402 100644
--- a/sys/arch/luna88k/luna88k/conf.c
+++ b/sys/arch/luna88k/luna88k/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.18 2012/08/23 06:12:49 deraadt Exp $	*/
+/*	$OpenBSD: conf.c,v 1.19 2013/06/03 17:33:58 tedu Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -140,7 +140,7 @@ struct cdevsw	cdevsw[] =
 	cdev_notdef(),			/* 42 */
 	cdev_ksyms_init(NKSYMS,ksyms),	/* 43: Kernel symbols device */
 	cdev_ch_init(NCH,ch),		/* 44: SCSI autochanger */
-	cdev_notdef(),			/* 45 */
+	cdev_fuse_init(NFUSE,fuse),	/* 45: fuse */
 	cdev_notdef(),			/* 46 */
 	cdev_notdef(),			/* 47 */
 	cdev_notdef(),			/* 48 */
diff --git a/sys/arch/macppc/macppc/conf.c b/sys/arch/macppc/macppc/conf.c
index ffe0191c580..c77e09ba637 100644
--- a/sys/arch/macppc/macppc/conf.c
+++ b/sys/arch/macppc/macppc/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.51 2013/03/15 09:10:52 ratchov Exp $ */
+/*	$OpenBSD: conf.c,v 1.52 2013/06/03 17:33:58 tedu Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom
@@ -141,6 +141,7 @@ cdev_decl(pci);
 #include "bio.h"
 #include "vscsi.h"
 #include "pppx.h"
+#include "fuse.h"
 
 struct cdevsw cdevsw[] = {
 	cdev_cn_init(1,cn),		/* 0: virtual console */
@@ -239,6 +240,7 @@ struct cdevsw cdevsw[] = {
 	cdev_pppx_init(NPPPX,pppx),	/* 85: pppx */
 	cdev_agp_init(NAGP,agp),	/* 86: agp */
 	cdev_drm_init(NDRM,drm),	/* 87: drm */
+	cdev_fuse_init(NFUSE,fuse),	/* 88: fuse */
 };
 int nchrdev = nitems(cdevsw);
 
diff --git a/sys/arch/mvme68k/mvme68k/conf.c b/sys/arch/mvme68k/mvme68k/conf.c
index 1429e005250..5ff83df4dd4 100644
--- a/sys/arch/mvme68k/mvme68k/conf.c
+++ b/sys/arch/mvme68k/mvme68k/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.54 2012/08/23 06:12:49 deraadt Exp $ */
+/*	$OpenBSD: conf.c,v 1.55 2013/06/03 17:33:58 tedu Exp $ */
 
 /*-
  * Copyright (c) 1995 Theo de Raadt
@@ -149,6 +149,7 @@ cdev_decl(xd);
 
 #include "vscsi.h"
 #include "pppx.h"
+#include "fuse.h"
 
 struct cdevsw	cdevsw[] =
 {
@@ -212,6 +213,8 @@ struct cdevsw	cdevsw[] =
 	cdev_vscsi_init(NVSCSI,vscsi),	/* 53: vscsi */
 	cdev_disk_init(1,diskmap),	/* 54: disk mapper */
 	cdev_pppx_init(NPPPX,pppx),	/* 55: pppx */
+	cdev_notdef(),			/* 56: hotplug on hp300 */
+	cdev_fuse_init(NFUSE,fuse),	/* 57: fuse */
 };
 int	nchrdev = nitems(cdevsw);
 
diff --git a/sys/arch/mvme88k/mvme88k/conf.c b/sys/arch/mvme88k/mvme88k/conf.c
index 8095e32f91f..c20bfc92fc9 100644
--- a/sys/arch/mvme88k/mvme88k/conf.c
+++ b/sys/arch/mvme88k/mvme88k/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.47 2012/08/23 06:12:49 deraadt Exp $	*/
+/*	$OpenBSD: conf.c,v 1.48 2013/06/03 17:33:58 tedu Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -99,6 +99,7 @@ cdev_decl(lptwo);
 
 #include "vscsi.h"
 #include "pppx.h"
+#include "fuse.h"
 
 struct bdevsw	bdevsw[] =
 {
@@ -188,7 +189,7 @@ struct cdevsw	cdevsw[] =
 	cdev_notdef(),			/* 42 */
 	cdev_ksyms_init(NKSYMS,ksyms),	/* 43: Kernel symbols device */
 	cdev_ch_init(NCH,ch),		/* 44: SCSI autochanger */
-	cdev_notdef(),			/* 45 */
+	cdev_fuse_init(NFUSE,fuse),	/* 45: fuse */
 	cdev_notdef(),			/* 46 */
 	cdev_notdef(),			/* 47 */
 	cdev_notdef(),			/* 48 */
diff --git a/sys/arch/octeon/octeon/conf.c b/sys/arch/octeon/octeon/conf.c
index af3b628ee6b..6f6b3ae4b34 100644
--- a/sys/arch/octeon/octeon/conf.c
+++ b/sys/arch/octeon/octeon/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.8 2012/08/23 06:12:49 deraadt Exp $ */
+/*	$OpenBSD: conf.c,v 1.9 2013/06/03 17:33:58 tedu Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -137,6 +137,7 @@ cdev_decl(pci);
 #include "bthub.h"
 #include "vscsi.h"
 #include "pppx.h"
+#include "fuse.h"
 
 struct cdevsw	cdevsw[] =
 {
@@ -201,7 +202,7 @@ struct cdevsw	cdevsw[] =
 	cdev_systrace_init(NSYSTRACE,systrace),	/* 50: system call tracing */
 	cdev_notdef(),			/* 51: */
 	cdev_ptm_init(NPTY,ptm),	/* 52: pseudo-tty ptm device */
-	cdev_notdef(),			/* 53: */
+	cdev_fuse_init(NFUSE,fuse),	/* 53: fuse */
 	cdev_notdef(),			/* 54: */
 	cdev_notdef(),			/* 55: */
 	cdev_notdef(),			/* 56: */