summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/alpha/alpha/conf.c3
-rw-r--r--sys/arch/amiga/amiga/conf.c3
-rw-r--r--sys/arch/hp300/hp300/conf.c3
-rw-r--r--sys/arch/hppa/hppa/conf.c3
-rw-r--r--sys/arch/i386/i386/conf.c3
-rw-r--r--sys/arch/mac68k/mac68k/conf.c3
-rw-r--r--sys/arch/macppc/macppc/conf.c3
-rw-r--r--sys/arch/mvme68k/mvme68k/conf.c3
-rw-r--r--sys/arch/mvme88k/mvme88k/conf.c3
-rw-r--r--sys/arch/mvmeppc/mvmeppc/conf.c3
-rw-r--r--sys/arch/sparc/sparc/conf.c3
-rw-r--r--sys/arch/sparc64/sparc64/conf.c3
-rw-r--r--sys/arch/sun3/sun3/conf.c3
-rw-r--r--sys/arch/vax/vax/conf.c3
-rw-r--r--sys/sys/conf.h6
15 files changed, 17 insertions, 31 deletions
diff --git a/sys/arch/alpha/alpha/conf.c b/sys/arch/alpha/alpha/conf.c
index 466d6c660f7..45734fdbc0d 100644
--- a/sys/arch/alpha/alpha/conf.c
+++ b/sys/arch/alpha/alpha/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.30 2001/08/06 22:34:43 mickey Exp $ */
+/* $OpenBSD: conf.c,v 1.31 2001/09/28 02:53:13 mickey Exp $ */
/* $NetBSD: conf.c,v 1.16 1996/10/18 21:26:57 cgd Exp $ */
/*-
@@ -132,7 +132,6 @@ cdev_decl(ucom);
#include "ugen.h"
cdev_decl(ugen);
#include "pf.h"
-cdev_decl(pf);
#ifdef USER_PCICONF
#include "pci.h"
cdev_decl(pci);
diff --git a/sys/arch/amiga/amiga/conf.c b/sys/arch/amiga/amiga/conf.c
index fcdb06f97e8..a7c86838283 100644
--- a/sys/arch/amiga/amiga/conf.c
+++ b/sys/arch/amiga/amiga/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.31 2001/06/27 06:56:27 kjc Exp $ */
+/* $OpenBSD: conf.c,v 1.32 2001/09/28 02:53:13 mickey Exp $ */
/* $NetBSD: conf.c,v 1.42 1997/01/07 11:35:03 mrg Exp $ */
/*-
@@ -117,7 +117,6 @@ cdev_decl(audio);
(dev_type_mmap((*)))enodev }
#include "pf.h"
-cdev_decl(pf);
#include <altq/altqconf.h>
diff --git a/sys/arch/hp300/hp300/conf.c b/sys/arch/hp300/hp300/conf.c
index 86428d35233..8b9fa945660 100644
--- a/sys/arch/hp300/hp300/conf.c
+++ b/sys/arch/hp300/hp300/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.26 2001/08/06 22:34:43 mickey Exp $ */
+/* $OpenBSD: conf.c,v 1.27 2001/09/28 02:53:13 mickey Exp $ */
/* $NetBSD: conf.c,v 1.39 1997/05/12 08:17:53 thorpej Exp $ */
/*-
@@ -151,7 +151,6 @@ cdev_decl(xfs_dev);
#endif
#include "pf.h"
-cdev_decl(pf);
#include <altq/altqconf.h>
diff --git a/sys/arch/hppa/hppa/conf.c b/sys/arch/hppa/hppa/conf.c
index 1726bfc6f35..312682bafd2 100644
--- a/sys/arch/hppa/hppa/conf.c
+++ b/sys/arch/hppa/hppa/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.14 2001/08/12 20:20:42 mickey Exp $ */
+/* $OpenBSD: conf.c,v 1.15 2001/09/28 02:53:13 mickey Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -114,7 +114,6 @@ cdev_decl(lpt);
cdev_decl(com);
#include "pf.h"
-cdev_decl(pf);
#include <altq/altqconf.h>
diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c
index 3214f21ceda..04d78f15af7 100644
--- a/sys/arch/i386/i386/conf.c
+++ b/sys/arch/i386/i386/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.79 2001/08/18 06:08:08 mickey Exp $ */
+/* $OpenBSD: conf.c,v 1.80 2001/09/28 02:53:13 mickey Exp $ */
/* $NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $ */
/*
@@ -236,7 +236,6 @@ cdev_decl(pci);
#endif
#include "pf.h"
-cdev_decl(pf);
#include <altq/altqconf.h>
diff --git a/sys/arch/mac68k/mac68k/conf.c b/sys/arch/mac68k/mac68k/conf.c
index c8c7f3622e1..7a0cde15813 100644
--- a/sys/arch/mac68k/mac68k/conf.c
+++ b/sys/arch/mac68k/mac68k/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.25 2001/08/06 22:34:44 mickey Exp $ */
+/* $OpenBSD: conf.c,v 1.26 2001/09/28 02:53:13 mickey Exp $ */
/* $NetBSD: conf.c,v 1.41 1997/02/11 07:35:49 scottr Exp $ */
/*
@@ -118,7 +118,6 @@ cdev_decl(xfs_dev);
#endif
#include "pf.h"
-cdev_decl(pf);
#include <altq/altqconf.h>
diff --git a/sys/arch/macppc/macppc/conf.c b/sys/arch/macppc/macppc/conf.c
index c6e1956df09..80760481f87 100644
--- a/sys/arch/macppc/macppc/conf.c
+++ b/sys/arch/macppc/macppc/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.2 2001/09/27 17:30:56 drahn Exp $ */
+/* $OpenBSD: conf.c,v 1.3 2001/09/28 02:53:13 mickey Exp $ */
/*
* Copyright (c) 1997 Per Fogelstrom
@@ -186,7 +186,6 @@ cdev_decl(pci);
cdev_decl(audio);
#include "pf.h"
-cdev_decl(pf);
#include <altq/altqconf.h>
diff --git a/sys/arch/mvme68k/mvme68k/conf.c b/sys/arch/mvme68k/mvme68k/conf.c
index a161ad2d523..ff26ac3690e 100644
--- a/sys/arch/mvme68k/mvme68k/conf.c
+++ b/sys/arch/mvme68k/mvme68k/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.23 2001/08/06 22:34:44 mickey Exp $ */
+/* $OpenBSD: conf.c,v 1.24 2001/09/28 02:53:13 mickey Exp $ */
/*-
* Copyright (c) 1995 Theo de Raadt
@@ -177,7 +177,6 @@ dev_decl(filedesc,open);
#include "tun.h"
#include "pf.h"
-cdev_decl(pf);
#include <altq/altqconf.h>
diff --git a/sys/arch/mvme88k/mvme88k/conf.c b/sys/arch/mvme88k/mvme88k/conf.c
index 185ac2ee161..dcddf76d533 100644
--- a/sys/arch/mvme88k/mvme88k/conf.c
+++ b/sys/arch/mvme88k/mvme88k/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.19 2001/08/23 22:33:23 miod Exp $ */
+/* $OpenBSD: conf.c,v 1.20 2001/09/28 02:53:13 mickey Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -114,7 +114,6 @@ cdev_decl(lptwo);
#endif /* notyet */
#include "pf.h"
-cdev_decl(pf);
#include <altq/altqconf.h>
diff --git a/sys/arch/mvmeppc/mvmeppc/conf.c b/sys/arch/mvmeppc/mvmeppc/conf.c
index ada859d2dd4..1d1dab6059b 100644
--- a/sys/arch/mvmeppc/mvmeppc/conf.c
+++ b/sys/arch/mvmeppc/mvmeppc/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.7 2001/08/06 22:34:44 mickey Exp $ */
+/* $OpenBSD: conf.c,v 1.8 2001/09/28 02:53:13 mickey Exp $ */
/*
* Copyright (c) 1997 Per Fogelstrom
@@ -148,7 +148,6 @@ cdev_decl(lkm);
cdev_decl(ksyms);
#include "pf.h"
-cdev_decl(pf);
#include <altq/altqconf.h>
diff --git a/sys/arch/sparc/sparc/conf.c b/sys/arch/sparc/sparc/conf.c
index 68bd2bf6d5f..af5e6f9bae6 100644
--- a/sys/arch/sparc/sparc/conf.c
+++ b/sys/arch/sparc/sparc/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.28 2001/06/27 06:56:29 kjc Exp $ */
+/* $OpenBSD: conf.c,v 1.29 2001/09/28 02:53:13 mickey Exp $ */
/* $NetBSD: conf.c,v 1.40 1996/04/11 19:20:03 thorpej Exp $ */
/*
@@ -129,7 +129,6 @@ struct bdevsw bdevsw[] =
int nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]);
#include "pf.h"
-cdev_decl(pf);
#include <altq/altqconf.h>
diff --git a/sys/arch/sparc64/sparc64/conf.c b/sys/arch/sparc64/sparc64/conf.c
index 7ee8fd53ecd..67dfc613162 100644
--- a/sys/arch/sparc64/sparc64/conf.c
+++ b/sys/arch/sparc64/sparc64/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.9 2001/09/20 20:50:03 jason Exp $ */
+/* $OpenBSD: conf.c,v 1.10 2001/09/28 02:53:14 mickey Exp $ */
/* $NetBSD: conf.c,v 1.17 2001/03/26 12:33:26 lukem Exp $ */
/*
@@ -117,7 +117,6 @@
cdev_decl(ses);
#include "pf.h"
-cdev_decl(pf);
#include <altq/altqconf.h>
diff --git a/sys/arch/sun3/sun3/conf.c b/sys/arch/sun3/sun3/conf.c
index d4fb4da1eb5..4320d208f65 100644
--- a/sys/arch/sun3/sun3/conf.c
+++ b/sys/arch/sun3/sun3/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.29 2001/06/27 06:56:30 kjc Exp $ */
+/* $OpenBSD: conf.c,v 1.30 2001/09/28 02:53:14 mickey Exp $ */
/* $NetBSD: conf.c,v 1.51 1996/11/04 16:16:09 gwr Exp $ */
/*-
@@ -112,7 +112,6 @@ struct bdevsw bdevsw[] =
int nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]);
#include "pf.h"
-cdev_decl(pf);
#include <altq/altqconf.h>
diff --git a/sys/arch/vax/vax/conf.c b/sys/arch/vax/vax/conf.c
index 60d3f04d508..bc2358b3eb1 100644
--- a/sys/arch/vax/vax/conf.c
+++ b/sys/arch/vax/vax/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.29 2001/08/06 22:34:44 mickey Exp $ */
+/* $OpenBSD: conf.c,v 1.30 2001/09/28 02:53:14 mickey Exp $ */
/* $NetBSD: conf.c,v 1.44 1999/10/27 16:38:54 ragge Exp $ */
/*-
@@ -433,7 +433,6 @@ dev_decl(filedesc,open);
#include "wsmouse.h"
#include "pf.h"
-cdev_decl(pf);
#include <altq/altqconf.h>
diff --git a/sys/sys/conf.h b/sys/sys/conf.h
index f2272bacf12..831bc7633a3 100644
--- a/sys/sys/conf.h
+++ b/sys/sys/conf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.h,v 1.47 2001/08/06 22:34:44 mickey Exp $ */
+/* $OpenBSD: conf.h,v 1.48 2001/09/28 02:53:13 mickey Exp $ */
/* $NetBSD: conf.h,v 1.33 1996/05/03 20:03:32 christos Exp $ */
/*-
@@ -530,12 +530,12 @@ cdev_decl(uk);
cdev_decl(bpf);
+cdev_decl(pf);
+
cdev_decl(tun);
cdev_decl(random);
-cdev_decl(ipl);
-
cdev_decl(wsdisplay);
cdev_decl(wskbd);
cdev_decl(wsmouse);