summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authoruebayasi <uebayasi@NetBSD.org>2011-07-31 13:51:53 +0000
committeruebayasi <uebayasi@NetBSD.org>2011-07-31 13:51:53 +0000
commitfdc2d3a9a024f470e571e8d6550c30b6a43eaccf (patch)
treef8ebf509779cbcf403c40cc65fdca79af0c06017 /sys/dev
parent6b70f772dd8b210f23c8375d12c3b0f098fe968e (diff)
Put back #include "ioconf.h" per popular demand.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/bluetooth/bcsp.c7
-rw-r--r--sys/dev/bluetooth/bthub.c8
-rw-r--r--sys/dev/bluetooth/btuart.c8
-rw-r--r--sys/dev/ieee1394/fwdev.c7
-rw-r--r--sys/dev/ieee1394/fwmem.c8
-rw-r--r--sys/dev/ieee1394/fwohci.c9
6 files changed, 24 insertions, 23 deletions
diff --git a/sys/dev/bluetooth/bcsp.c b/sys/dev/bluetooth/bcsp.c
index 8c4e973c38f..781412a8404 100644
--- a/sys/dev/bluetooth/bcsp.c
+++ b/sys/dev/bluetooth/bcsp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bcsp.c,v 1.19 2011/05/25 16:33:37 uebayasi Exp $ */
+/* $NetBSD: bcsp.c,v 1.20 2011/07/31 13:51:53 uebayasi Exp $ */
/*
* Copyright (c) 2007 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcsp.c,v 1.19 2011/05/25 16:33:37 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcsp.c,v 1.20 2011/07/31 13:51:53 uebayasi Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -50,6 +50,8 @@ __KERNEL_RCSID(0, "$NetBSD: bcsp.c,v 1.19 2011/05/25 16:33:37 uebayasi Exp $");
#include <dev/bluetooth/bcsp.h>
+#include "ioconf.h"
+
#ifdef BCSP_DEBUG
#ifdef DPRINTF
#undef DPRINTF
@@ -184,7 +186,6 @@ static void bcsp_stats(device_t, struct bt_stats *, int);
static void bcsp_packet_print(struct mbuf *m);
#endif
-extern struct cfdriver bcsp_cd;
/*
* It doesn't need to be exported, as only bcspattach() uses it,
diff --git a/sys/dev/bluetooth/bthub.c b/sys/dev/bluetooth/bthub.c
index 214b7022e90..a37f6669214 100644
--- a/sys/dev/bluetooth/bthub.c
+++ b/sys/dev/bluetooth/bthub.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bthub.c,v 1.16 2011/05/25 16:33:37 uebayasi Exp $ */
+/* $NetBSD: bthub.c,v 1.17 2011/07/31 13:51:53 uebayasi Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bthub.c,v 1.16 2011/05/25 16:33:37 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bthub.c,v 1.17 2011/07/31 13:51:53 uebayasi Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -51,6 +51,8 @@ __KERNEL_RCSID(0, "$NetBSD: bthub.c,v 1.16 2011/05/25 16:33:37 uebayasi Exp $");
#include <dev/bluetooth/btdev.h>
+#include "ioconf.h"
+
/*****************************************************************************
*
* Bluetooth Device Hub
@@ -61,8 +63,6 @@ static int bthub_match(device_t, cfdata_t, void *);
static void bthub_attach(device_t, device_t, void *);
static int bthub_detach(device_t, int);
-extern struct cfdriver bthub_cd;
-
CFATTACH_DECL_NEW(bthub, 0,
bthub_match, bthub_attach, bthub_detach, NULL);
diff --git a/sys/dev/bluetooth/btuart.c b/sys/dev/bluetooth/btuart.c
index 3208c33fabd..ba6d052b28c 100644
--- a/sys/dev/bluetooth/btuart.c
+++ b/sys/dev/bluetooth/btuart.c
@@ -1,4 +1,4 @@
-/* $NetBSD: btuart.c,v 1.25 2011/05/25 16:33:37 uebayasi Exp $ */
+/* $NetBSD: btuart.c,v 1.26 2011/07/31 13:51:53 uebayasi Exp $ */
/*-
* Copyright (c) 2006, 2007 KIYOHARA Takashi
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btuart.c,v 1.25 2011/05/25 16:33:37 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btuart.c,v 1.26 2011/07/31 13:51:53 uebayasi Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -49,6 +49,8 @@ __KERNEL_RCSID(0, "$NetBSD: btuart.c,v 1.25 2011/05/25 16:33:37 uebayasi Exp $")
#include <netbt/bluetooth.h>
#include <netbt/hci.h>
+#include "ioconf.h"
+
struct btuart_softc {
device_t sc_dev;
struct tty * sc_tp; /* tty pointer */
@@ -97,8 +99,6 @@ static void btuart_output_acl(device_t, struct mbuf *);
static void btuart_output_sco(device_t, struct mbuf *);
static void btuart_stats(device_t, struct bt_stats *, int);
-extern struct cfdriver btuart_cd;
-
/*
* It doesn't need to be exported, as only btuartattach() uses it,
* but there's no "official" way to make it static.
diff --git a/sys/dev/ieee1394/fwdev.c b/sys/dev/ieee1394/fwdev.c
index 7bcc8c5e682..d8c698afe4c 100644
--- a/sys/dev/ieee1394/fwdev.c
+++ b/sys/dev/ieee1394/fwdev.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fwdev.c,v 1.25 2011/05/25 16:33:37 uebayasi Exp $ */
+/* $NetBSD: fwdev.c,v 1.26 2011/07/31 13:51:53 uebayasi Exp $ */
/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fwdev.c,v 1.25 2011/05/25 16:33:37 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fwdev.c,v 1.26 2011/07/31 13:51:53 uebayasi Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -58,6 +58,8 @@ __KERNEL_RCSID(0, "$NetBSD: fwdev.c,v 1.25 2011/05/25 16:33:37 uebayasi Exp $");
#include <dev/ieee1394/fwmem.h>
#include <dev/ieee1394/iec68113.h>
+#include "ioconf.h"
+
#define FWNODE_INVAL 0xffff
dev_type_open(fw_open);
@@ -94,7 +96,6 @@ static int fw_read_async(struct fw_drv1 *, struct uio *, int);
static int fw_write_async(struct fw_drv1 *, struct uio *, int);
static void fw_hand(struct fw_xfer *);
-extern struct cfdriver ieee1394if_cd;
int
fw_open(dev_t dev, int flags, int fmt, struct lwp *td)
diff --git a/sys/dev/ieee1394/fwmem.c b/sys/dev/ieee1394/fwmem.c
index 202ca05a364..6b96fcd36de 100644
--- a/sys/dev/ieee1394/fwmem.c
+++ b/sys/dev/ieee1394/fwmem.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fwmem.c,v 1.15 2011/05/25 16:33:37 uebayasi Exp $ */
+/* $NetBSD: fwmem.c,v 1.16 2011/07/31 13:51:53 uebayasi Exp $ */
/*-
* Copyright (c) 2002-2003
* Hidetoshi Shimokawa. All rights reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fwmem.c,v 1.15 2011/05/25 16:33:37 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fwmem.c,v 1.16 2011/07/31 13:51:53 uebayasi Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -51,6 +51,8 @@ __KERNEL_RCSID(0, "$NetBSD: fwmem.c,v 1.15 2011/05/25 16:33:37 uebayasi Exp $");
#include <dev/ieee1394/firewirereg.h>
#include <dev/ieee1394/fwmem.h>
+#include "ioconf.h"
+
static int fwmem_speed=2, fwmem_debug=0;
static struct fw_eui64 fwmem_eui64;
@@ -61,8 +63,6 @@ static struct fw_xfer *fwmem_xfer_req(struct fw_device *, void *, int, int,
int, void *);
static void fwmem_biodone(struct fw_xfer *);
-extern struct cfdriver ieee1394if_cd;
-
/*
* Setup sysctl(3) MIB, hw.fwmem.*
*
diff --git a/sys/dev/ieee1394/fwohci.c b/sys/dev/ieee1394/fwohci.c
index 939804a497f..07e60b19c03 100644
--- a/sys/dev/ieee1394/fwohci.c
+++ b/sys/dev/ieee1394/fwohci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fwohci.c,v 1.131 2011/05/25 16:33:37 uebayasi Exp $ */
+/* $NetBSD: fwohci.c,v 1.132 2011/07/31 13:51:53 uebayasi Exp $ */
/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
@@ -37,7 +37,7 @@
*
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.131 2011/05/25 16:33:37 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.132 2011/07/31 13:51:53 uebayasi Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -61,13 +61,12 @@ __KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.131 2011/05/25 16:33:37 uebayasi Exp $"
#include <dev/ieee1394/fwohcivar.h>
#include <dev/ieee1394/firewire_phy.h>
+#include "ioconf.h"
+
#undef OHCI_DEBUG
static int nocyclemaster = 0;
int firewire_phydma_enable = 1;
-
-extern struct cfdriver fwohci_cd;
-
/*
* Setup sysctl(3) MIB, hw.fwohci.*
*