summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/arch/amd64/amd64/conf.c3
-rw-r--r--sys/arch/i386/i386/conf.c3
-rw-r--r--sys/conf/files14
-rw-r--r--sys/dev/gpio/files.gpio4
-rw-r--r--sys/dev/isa/files.isa4
-rw-r--r--sys/dev/pv/files.pv4
-rw-r--r--sys/dev/pv/pvbus.c4
-rw-r--r--sys/dev/usb/files.usb6
-rw-r--r--sys/net/if.c3
-rw-r--r--sys/net/if_enc.c3
-rw-r--r--sys/net/if_mpe.c3
-rw-r--r--sys/netmpls/mpls_input.c4
-rw-r--r--sys/scsi/files.scsi6
13 files changed, 26 insertions, 35 deletions
diff --git a/sys/arch/amd64/amd64/conf.c b/sys/arch/amd64/amd64/conf.c
index 330dcbf8e10..d7bf314a2f7 100644
--- a/sys/arch/amd64/amd64/conf.c
+++ b/sys/arch/amd64/amd64/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.67 2020/01/23 02:40:21 dlg Exp $ */
+/* $OpenBSD: conf.c,v 1.68 2020/01/24 05:14:51 jsg Exp $ */
/*
* Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved.
@@ -41,7 +41,6 @@
#include "wd.h"
bdev_decl(wd);
-#include "fdc.h"
#include "fd.h"
bdev_decl(fd);
#include "sd.h"
diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c
index 4b305c20f44..3831d9980b5 100644
--- a/sys/arch/i386/i386/conf.c
+++ b/sys/arch/i386/i386/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.166 2020/01/23 02:40:21 dlg Exp $ */
+/* $OpenBSD: conf.c,v 1.167 2020/01/24 05:14:51 jsg Exp $ */
/* $NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $ */
/*
@@ -43,7 +43,6 @@
#include "wd.h"
bdev_decl(wd);
-#include "fdc.h"
#include "fd.h"
bdev_decl(fd);
#include "sd.h"
diff --git a/sys/conf/files b/sys/conf/files
index f040915203c..1c623921b54 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-# $OpenBSD: files,v 1.683 2020/01/24 03:05:14 tedu Exp $
+# $OpenBSD: files,v 1.684 2020/01/24 05:14:51 jsg Exp $
# $NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
@@ -802,18 +802,18 @@ file net/rtable.c
file net/route.c
file net/rtsock.c
file net/slcompress.c ppp
-file net/if_enc.c enc needs-count
+file net/if_enc.c enc
file net/if_gre.c gre needs-count
-file net/if_trunk.c trunk needs-count
+file net/if_trunk.c trunk
file net/trunklacp.c trunk
file net/if_aggr.c aggr
file net/if_tpmr.c tpmr
-file net/if_mpe.c mpe needs-count
-file net/if_mpw.c mpw needs-count
+file net/if_mpe.c mpe
+file net/if_mpw.c mpw
file net/if_mpip.c mpip
file net/if_bpe.c bpe needs-count
-file net/if_vether.c vether needs-count
-file net/if_pair.c pair needs-count
+file net/if_vether.c vether
+file net/if_pair.c pair
file net/if_pppx.c pppx needs-count
file net/if_vxlan.c vxlan needs-count
file net/bfd.c bfd
diff --git a/sys/dev/gpio/files.gpio b/sys/dev/gpio/files.gpio
index abb9fb2bb9b..3f24a6cba44 100644
--- a/sys/dev/gpio/files.gpio
+++ b/sys/dev/gpio/files.gpio
@@ -1,4 +1,4 @@
-# $OpenBSD: files.gpio,v 1.10 2015/06/07 20:11:52 claudio Exp $
+# $OpenBSD: files.gpio,v 1.11 2020/01/24 05:14:51 jsg Exp $
define gpio {[offset = -1], [mask = 0], [flag = 0]}
@@ -9,7 +9,7 @@ file dev/gpio/gpio.c gpio needs-flag
# GPIO simulator
device gpiosim: gpiobus
attach gpiosim at root
-file dev/gpio/gpiosim.c gpiosim needs-flag
+file dev/gpio/gpiosim.c gpiosim
# I2C bus bit-banging
device gpioiic: i2cbus, i2c_bitbang
diff --git a/sys/dev/isa/files.isa b/sys/dev/isa/files.isa
index 2a670c39d27..f4475f1c686 100644
--- a/sys/dev/isa/files.isa
+++ b/sys/dev/isa/files.isa
@@ -1,4 +1,4 @@
-# $OpenBSD: files.isa,v 1.125 2020/01/22 05:06:19 tedu Exp $
+# $OpenBSD: files.isa,v 1.126 2020/01/24 05:14:51 jsg Exp $
# $NetBSD: files.isa,v 1.21 1996/05/16 03:45:55 mycroft Exp $
#
# Config file and device description for machine-independent ISA code.
@@ -28,7 +28,7 @@ file dev/isa/isadma.c isadma needs-flag
# Floppy disk controller
device fdc {[drive = -1]}
attach fdc at isa
-file dev/isa/fdc.c fdc needs-flag
+file dev/isa/fdc.c fdc
device fd: disk, isa_dma
attach fd at fdc
diff --git a/sys/dev/pv/files.pv b/sys/dev/pv/files.pv
index 422737de605..e081897d582 100644
--- a/sys/dev/pv/files.pv
+++ b/sys/dev/pv/files.pv
@@ -1,4 +1,4 @@
-# $OpenBSD: files.pv,v 1.15 2018/11/23 12:37:40 reyk Exp $
+# $OpenBSD: files.pv,v 1.16 2020/01/24 05:14:51 jsg Exp $
#
# Config file and device description for paravirtual devices.
# Included by ports that need it.
@@ -16,7 +16,7 @@ file dev/pv/pvclock.c pvclock needs-flag
# VMware Tools
device vmt
attach vmt at pvbus
-file dev/pv/vmt.c vmt needs-flag
+file dev/pv/vmt.c vmt
# Xen
device xen {}
diff --git a/sys/dev/pv/pvbus.c b/sys/dev/pv/pvbus.c
index 6c7b0be643f..7f4f85033f0 100644
--- a/sys/dev/pv/pvbus.c
+++ b/sys/dev/pv/pvbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pvbus.c,v 1.19 2019/05/13 15:40:34 pd Exp $ */
+/* $OpenBSD: pvbus.c,v 1.20 2020/01/24 05:14:51 jsg Exp $ */
/*
* Copyright (c) 2015 Reyk Floeter <reyk@openbsd.org>
@@ -43,8 +43,6 @@
#include <dev/pv/pvvar.h>
#include <dev/pv/pvreg.h>
-#include "vmt.h"
-
int has_hv_cpuid = 0;
extern char *hw_vendor;
diff --git a/sys/dev/usb/files.usb b/sys/dev/usb/files.usb
index 0f697127e92..c3597c54775 100644
--- a/sys/dev/usb/files.usb
+++ b/sys/dev/usb/files.usb
@@ -1,4 +1,4 @@
-# $OpenBSD: files.usb,v 1.141 2019/12/17 13:08:54 reyk Exp $
+# $OpenBSD: files.usb,v 1.142 2020/01/24 05:14:51 jsg Exp $
# $NetBSD: files.usb,v 1.16 2000/02/14 20:29:54 augustss Exp $
#
# Config file and device description for machine-independent USB code.
@@ -115,12 +115,12 @@ file dev/usb/ubcmtp.c ubcmtp
# Cypress microcontroller based serial adpaters
device ucycom: hid, ucombus
attach ucycom at uhidbus
-file dev/usb/ucycom.c ucycom needs-flag
+file dev/usb/ucycom.c ucycom
# Silicon Labs USB HID based UART controller
device uslhcom: hid, ucombus
attach uslhcom at uhidbus
-file dev/usb/uslhcom.c uslhcom needs-flag
+file dev/usb/uslhcom.c uslhcom
# Printers
device ulpt: firmload
diff --git a/sys/net/if.c b/sys/net/if.c
index b531d66a374..850d6e5abfc 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if.c,v 1.599 2019/11/14 01:02:02 dlg Exp $ */
+/* $OpenBSD: if.c,v 1.600 2020/01/24 05:14:51 jsg Exp $ */
/* $NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $ */
/*
@@ -70,7 +70,6 @@
#include "ppp.h"
#include "pppoe.h"
#include "switch.h"
-#include "trunk.h"
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/net/if_enc.c b/sys/net/if_enc.c
index aac6f1a9ab2..e9b1b0b3fc2 100644
--- a/sys/net/if_enc.c
+++ b/sys/net/if_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_enc.c,v 1.75 2019/07/14 06:37:01 florian Exp $ */
+/* $OpenBSD: if_enc.c,v 1.76 2020/01/24 05:14:51 jsg Exp $ */
/*
* Copyright (c) 2010 Reyk Floeter <reyk@vantronix.net>
@@ -16,7 +16,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include "enc.h"
#include "bpfilter.h"
#include <sys/param.h>
diff --git a/sys/net/if_mpe.c b/sys/net/if_mpe.c
index 0cb2242672c..33f9cf48c74 100644
--- a/sys/net/if_mpe.c
+++ b/sys/net/if_mpe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_mpe.c,v 1.94 2019/06/26 08:13:13 claudio Exp $ */
+/* $OpenBSD: if_mpe.c,v 1.95 2020/01/24 05:14:51 jsg Exp $ */
/*
* Copyright (c) 2008 Pierre-Yves Ritschard <pyr@spootnik.org>
@@ -15,7 +15,6 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include "mpe.h"
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/netmpls/mpls_input.c b/sys/netmpls/mpls_input.c
index 371376de8b7..c1be874461d 100644
--- a/sys/netmpls/mpls_input.c
+++ b/sys/netmpls/mpls_input.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mpls_input.c,v 1.75 2019/02/08 20:28:54 procter Exp $ */
+/* $OpenBSD: mpls_input.c,v 1.76 2020/01/24 05:14:52 jsg Exp $ */
/*
* Copyright (c) 2008 Claudio Jeker <claudio@openbsd.org>
@@ -16,8 +16,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include "mpe.h"
-
#include <sys/param.h>
#include <sys/mbuf.h>
#include <sys/systm.h>
diff --git a/sys/scsi/files.scsi b/sys/scsi/files.scsi
index e1cb16f449d..3ebead31304 100644
--- a/sys/scsi/files.scsi
+++ b/sys/scsi/files.scsi
@@ -1,4 +1,4 @@
-# $OpenBSD: files.scsi,v 1.25 2011/04/27 11:36:20 dlg Exp $
+# $OpenBSD: files.scsi,v 1.26 2020/01/24 05:14:52 jsg Exp $
# $NetBSD: files.scsi,v 1.4 1996/05/16 04:01:08 mycroft Exp $
#
# Config.new file and device description for machine-independent SCSI code.
@@ -34,11 +34,11 @@ file scsi/uk.c uk needs-flag
device safte: disk
attach safte at scsibus
-file scsi/safte.c safte needs-flag
+file scsi/safte.c safte
device ses: disk
attach ses at scsibus
-file scsi/ses.c ses needs-flag
+file scsi/ses.c ses
device sym
attach sym at scsibus
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 15:20:07 +0000