diff options
| author |   jsg <jsg@openbsd.org> | 2015-03-14 03:38:46 +0000 |
|---|---|---|
| committer | jsg <jsg@openbsd.org> | 2015-03-14 03:38:46 +0000 |
| commit | 21dab745d772244ad59a415114e48be2888cfbc8 (patch) | |
| tree | 0cf0a65bda8999c8207ac27cc59ed638fb036bb5 | |
| parent | Move the command line options (mainly -d and -v) out of struct bgpd_config (diff) | |
| download | wireguard-openbsd-21dab745d772244ad59a415114e48be2888cfbc8.tar.xz wireguard-openbsd-21dab745d772244ad59a415114e48be2888cfbc8.zip | |
Remove some includes include-what-you-use claims don't
have any direct symbols used. Tested for indirect use by compiling
amd64/i386/sparc64 kernels.
ok tedu@ deraadt@
570 files changed, 569 insertions, 1202 deletions
diff --git a/sys/arch/amd64/amd64/acpi_machdep.c b/sys/arch/amd64/amd64/acpi_machdep.c index 2b641b921e6..36307d07e62 100644 --- a/sys/arch/amd64/amd64/acpi_machdep.c +++ b/sys/arch/amd64/amd64/acpi_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpi_machdep.c,v 1.68 2015/01/06 12:50:47 dlg Exp $ */ +/* $OpenBSD: acpi_machdep.c,v 1.69 2015/03/14 03:38:46 jsg Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * @@ -50,7 +50,6 @@ #endif #if NLAPIC > 0 -#include <machine/apicvar.h> #include <machine/i82489reg.h> #include <machine/i82489var.h> #endif diff --git a/sys/arch/amd64/amd64/aesni.c b/sys/arch/amd64/amd64/aesni.c index f34ef1e17f7..8ea76b81b5a 100644 --- a/sys/arch/amd64/amd64/aesni.c +++ b/sys/arch/amd64/amd64/aesni.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aesni.c,v 1.31 2014/12/15 01:53:45 tedu Exp $ */ +/* $OpenBSD: aesni.c,v 1.32 2015/03/14 03:38:46 jsg Exp $ */ /*- * Copyright (c) 2003 Jason Wright * Copyright (c) 2003, 2004 Theo de Raadt @@ -33,8 +33,6 @@ #include <crypto/xform.h> #include <crypto/cryptosoft.h> -#include <dev/rndvar.h> - #include <machine/fpu.h> /* defines from crypto/xform.c */ diff --git a/sys/arch/amd64/amd64/amd64_mem.c b/sys/arch/amd64/amd64/amd64_mem.c index 568c670d552..6120b9621f9 100644 --- a/sys/arch/amd64/amd64/amd64_mem.c +++ b/sys/arch/amd64/amd64/amd64_mem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: amd64_mem.c,v 1.10 2014/12/15 01:53:45 tedu Exp $ */ +/* $OpenBSD: amd64_mem.c,v 1.11 2015/03/14 03:38:46 jsg Exp $ */ /* * Copyright (c) 1999 Michael Smith <msmith@freebsd.org> * All rights reserved. @@ -28,7 +28,6 @@ */ #include <sys/param.h> -#include <sys/kernel.h> #include <sys/systm.h> #include <sys/malloc.h> #include <sys/memrange.h> diff --git a/sys/arch/amd64/amd64/apic.c b/sys/arch/amd64/amd64/apic.c index c20e300a41b..c1b00de31de 100644 --- a/sys/arch/amd64/amd64/apic.c +++ b/sys/arch/amd64/amd64/apic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: apic.c,v 1.5 2009/08/13 13:24:48 kettenis Exp $ */ +/* $OpenBSD: apic.c,v 1.6 2015/03/14 03:38:46 jsg Exp $ */ /* $NetBSD: apic.c,v 1.1 2003/02/26 21:26:11 fvdl Exp $ */ /*- @@ -37,7 +37,6 @@ #include <machine/i82489reg.h> #include <machine/i82489var.h> -#include <machine/apicvar.h> void apic_format_redir(char *where1, char *where2, int idx, u_int32_t redirhi, diff --git a/sys/arch/amd64/amd64/autoconf.c b/sys/arch/amd64/amd64/autoconf.c index 7e699d193cc..fe4602f8442 100644 --- a/sys/arch/amd64/amd64/autoconf.c +++ b/sys/arch/amd64/amd64/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.41 2014/12/16 18:30:03 tedu Exp $ */ +/* $OpenBSD: autoconf.c,v 1.42 2015/03/14 03:38:46 jsg Exp $ */ /* $NetBSD: autoconf.c,v 1.1 2003/04/26 18:39:26 fvdl Exp $ */ /*- @@ -70,8 +70,6 @@ #include <machine/cpufunc.h> #include <machine/biosvar.h> -#include <dev/cons.h> - #include "ioapic.h" #include "lapic.h" diff --git a/sys/arch/amd64/amd64/bios.c b/sys/arch/amd64/amd64/bios.c index 30cf980117e..a4fff7badc2 100644 --- a/sys/arch/amd64/amd64/bios.c +++ b/sys/arch/amd64/amd64/bios.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bios.c,v 1.30 2014/12/15 01:53:45 tedu Exp $ */ +/* $OpenBSD: bios.c,v 1.31 2015/03/14 03:38:46 jsg Exp $ */ /* * Copyright (c) 2006 Gordon Willem Klok <gklok@cogeco.ca> * @@ -34,7 +34,6 @@ #include <amd64/include/isa_machdep.h> #include <dev/pci/pcivar.h> -#include <dev/acpi/acpireg.h> #include <dev/acpi/acpivar.h> #include <dev/rndvar.h> diff --git a/sys/arch/amd64/amd64/conf.c b/sys/arch/amd64/amd64/conf.c index 451cf19a8c9..c9e87777437 100644 --- a/sys/arch/amd64/amd64/conf.c +++ b/sys/arch/amd64/amd64/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.49 2014/12/11 19:44:16 tedu Exp $ */ +/* $OpenBSD: conf.c,v 1.50 2015/03/14 03:38:46 jsg Exp $ */ /* * Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved. @@ -31,7 +31,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/buf.h> #include <sys/device.h> #include <sys/disklabel.h> #include <sys/ioctl.h> diff --git a/sys/arch/amd64/amd64/consinit.c b/sys/arch/amd64/amd64/consinit.c index 10edb215b2a..301f8a281ea 100644 --- a/sys/arch/amd64/amd64/consinit.c +++ b/sys/arch/amd64/amd64/consinit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: consinit.c,v 1.4 2008/04/30 13:59:32 dlg Exp $ */ +/* $OpenBSD: consinit.c,v 1.5 2015/03/14 03:38:46 jsg Exp $ */ /* $NetBSD: consinit.c,v 1.2 2003/03/02 18:27:14 fvdl Exp $ */ /* @@ -32,8 +32,6 @@ #include <sys/device.h> #include <machine/bus.h> -#include <dev/cons.h> - void consinit() { diff --git a/sys/arch/amd64/amd64/db_disasm.c b/sys/arch/amd64/amd64/db_disasm.c index 0c3d1b2d985..846c4c2e9d0 100644 --- a/sys/arch/amd64/amd64/db_disasm.c +++ b/sys/arch/amd64/amd64/db_disasm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_disasm.c,v 1.13 2014/09/14 14:17:23 jsg Exp $ */ +/* $OpenBSD: db_disasm.c,v 1.14 2015/03/14 03:38:46 jsg Exp $ */ /* $NetBSD: db_disasm.c,v 1.11 1996/05/03 19:41:58 christos Exp $ */ /* @@ -38,7 +38,6 @@ #include <ddb/db_access.h> #include <ddb/db_sym.h> #include <ddb/db_output.h> -#include <ddb/db_interface.h> /* * Size attributes diff --git a/sys/arch/amd64/amd64/db_interface.c b/sys/arch/amd64/amd64/db_interface.c index adcc52de28d..a822f22515c 100644 --- a/sys/arch/amd64/amd64/db_interface.c +++ b/sys/arch/amd64/amd64/db_interface.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_interface.c,v 1.21 2014/10/15 15:55:42 uebayasi Exp $ */ +/* $OpenBSD: db_interface.c,v 1.22 2015/03/14 03:38:46 jsg Exp $ */ /* $NetBSD: db_interface.c,v 1.1 2003/04/26 18:39:27 fvdl Exp $ */ /* @@ -51,7 +51,6 @@ #include <ddb/db_sym.h> #include <ddb/db_command.h> #include <ddb/db_extern.h> -#include <ddb/db_access.h> #include <ddb/db_output.h> #include <ddb/db_run.h> #include <ddb/db_var.h> diff --git a/sys/arch/amd64/amd64/db_memrw.c b/sys/arch/amd64/amd64/db_memrw.c index 866e7fa6e69..7c4a6540a05 100644 --- a/sys/arch/amd64/amd64/db_memrw.c +++ b/sys/arch/amd64/amd64/db_memrw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_memrw.c,v 1.6 2014/09/14 14:17:23 jsg Exp $ */ +/* $OpenBSD: db_memrw.c,v 1.7 2015/03/14 03:38:46 jsg Exp $ */ /* $NetBSD: db_memrw.c,v 1.1 2003/04/26 18:39:27 fvdl Exp $ */ /*- @@ -58,8 +58,6 @@ #include <machine/db_machdep.h> -#include <ddb/db_access.h> - /* * Read bytes from kernel address space for debugger. */ diff --git a/sys/arch/amd64/amd64/db_trace.c b/sys/arch/amd64/amd64/db_trace.c index 1b45a85ac9d..ff7a593ae6c 100644 --- a/sys/arch/amd64/amd64/db_trace.c +++ b/sys/arch/amd64/amd64/db_trace.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_trace.c,v 1.8 2014/07/13 12:11:01 jasper Exp $ */ +/* $OpenBSD: db_trace.c,v 1.9 2015/03/14 03:38:46 jsg Exp $ */ /* $NetBSD: db_trace.c,v 1.1 2003/04/26 18:39:27 fvdl Exp $ */ /* @@ -40,7 +40,6 @@ #include <ddb/db_access.h> #include <ddb/db_variables.h> #include <ddb/db_output.h> -#include <ddb/db_interface.h> #if 1 #define dbreg(xx) (long *)offsetof(db_regs_t, tf_ ## xx) diff --git a/sys/arch/amd64/amd64/disksubr.c b/sys/arch/amd64/amd64/disksubr.c index 326c9eb95bd..76e88b8e874 100644 --- a/sys/arch/amd64/amd64/disksubr.c +++ b/sys/arch/amd64/amd64/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.68 2014/08/30 10:41:10 miod Exp $ */ +/* $OpenBSD: disksubr.c,v 1.69 2015/03/14 03:38:46 jsg Exp $ */ /* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */ /* @@ -32,7 +32,6 @@ */ #include <sys/param.h> -#include <sys/systm.h> #include <sys/buf.h> #include <sys/disklabel.h> #include <sys/disk.h> diff --git a/sys/arch/amd64/amd64/est.c b/sys/arch/amd64/amd64/est.c index 944f75449ac..0399615c74e 100644 --- a/sys/arch/amd64/amd64/est.c +++ b/sys/arch/amd64/amd64/est.c @@ -1,4 +1,4 @@ -/* $OpenBSD: est.c,v 1.35 2014/12/09 06:58:28 doug Exp $ */ +/* $OpenBSD: est.c,v 1.36 2015/03/14 03:38:46 jsg Exp $ */ /* * Copyright (c) 2003 Michael Eriksson. * All rights reserved. @@ -67,7 +67,6 @@ #if NACPICPU > 0 #include <dev/acpi/acpidev.h> -#include <dev/acpi/acpivar.h> #endif /* Possible bus speeds (multiplied by 100 for rounding) */ diff --git a/sys/arch/amd64/amd64/fpu.c b/sys/arch/amd64/amd64/fpu.c index 0882c4b2726..4ebfdf0be6c 100644 --- a/sys/arch/amd64/amd64/fpu.c +++ b/sys/arch/amd64/amd64/fpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fpu.c,v 1.29 2014/05/06 11:50:13 mpi Exp $ */ +/* $OpenBSD: fpu.c,v 1.30 2015/03/14 03:38:46 jsg Exp $ */ /* $NetBSD: fpu.c,v 1.1 2003/04/26 18:39:28 fvdl Exp $ */ /*- @@ -54,7 +54,6 @@ #include <machine/fpu.h> #include <machine/lock.h> -#include <dev/isa/isareg.h> #include <dev/isa/isavar.h> /* diff --git a/sys/arch/amd64/amd64/gdt.c b/sys/arch/amd64/amd64/gdt.c index df3e281dc57..e6933b5d436 100644 --- a/sys/arch/amd64/amd64/gdt.c +++ b/sys/arch/amd64/amd64/gdt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gdt.c,v 1.22 2014/12/15 01:53:45 tedu Exp $ */ +/* $OpenBSD: gdt.c,v 1.23 2015/03/14 03:38:46 jsg Exp $ */ /* $NetBSD: gdt.c,v 1.1 2003/04/26 18:39:28 fvdl Exp $ */ /*- @@ -41,7 +41,6 @@ #include <uvm/uvm_extern.h> -#include <machine/gdt.h> #include <machine/tss.h> #include <machine/pcb.h> diff --git a/sys/arch/amd64/amd64/hibernate_machdep.c b/sys/arch/amd64/amd64/hibernate_machdep.c index 3383a8202ef..4921343b70d 100644 --- a/sys/arch/amd64/amd64/hibernate_machdep.c +++ b/sys/arch/amd64/amd64/hibernate_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hibernate_machdep.c,v 1.35 2015/02/11 00:56:14 dlg Exp $ */ +/* $OpenBSD: hibernate_machdep.c,v 1.36 2015/03/14 03:38:46 jsg Exp $ */ /* * Copyright (c) 2012 Mike Larkin <mlarkin@openbsd.org> @@ -34,7 +34,6 @@ #include <uvm/uvm_pmemrange.h> #include <machine/cpu.h> -#include <machine/hibernate.h> #include <machine/hibernate_var.h> #include <machine/kcore.h> #include <machine/pte.h> diff --git a/sys/arch/amd64/amd64/i8259.c b/sys/arch/amd64/amd64/i8259.c index 47d62041690..b520ecde20e 100644 --- a/sys/arch/amd64/amd64/i8259.c +++ b/sys/arch/amd64/amd64/i8259.c @@ -1,4 +1,4 @@ -/* $OpenBSD: i8259.c,v 1.7 2014/09/14 14:17:23 jsg Exp $ */ +/* $OpenBSD: i8259.c,v 1.8 2015/03/14 03:38:46 jsg Exp $ */ /* $NetBSD: i8259.c,v 1.2 2003/03/02 18:27:15 fvdl Exp $ */ /* @@ -74,7 +74,6 @@ #include <sys/systm.h> #include <sys/kernel.h> #include <sys/syslog.h> -#include <sys/device.h> #include <sys/malloc.h> #include <dev/isa/isareg.h> diff --git a/sys/arch/amd64/amd64/identcpu.c b/sys/arch/amd64/amd64/identcpu.c index 4135c54ee0c..da9682a76bf 100644 --- a/sys/arch/amd64/amd64/identcpu.c +++ b/sys/arch/amd64/amd64/identcpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: identcpu.c,v 1.60 2015/02/08 04:41:48 deraadt Exp $ */ +/* $OpenBSD: identcpu.c,v 1.61 2015/03/14 03:38:46 jsg Exp $ */ /* $NetBSD: identcpu.c,v 1.1 2003/04/26 18:39:28 fvdl Exp $ */ /* @@ -38,7 +38,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/sysctl.h> #include <machine/cpu.h> #include <machine/cpufunc.h> diff --git a/sys/arch/amd64/amd64/intr.c b/sys/arch/amd64/amd64/intr.c index fb19dadec3a..81433436f6e 100644 --- a/sys/arch/amd64/amd64/intr.c +++ b/sys/arch/amd64/amd64/intr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.c,v 1.40 2015/01/06 12:50:47 dlg Exp $ */ +/* $OpenBSD: intr.c,v 1.41 2015/03/14 03:38:46 jsg Exp $ */ /* $NetBSD: intr.c,v 1.3 2003/03/03 22:16:20 fvdl Exp $ */ /* @@ -56,7 +56,6 @@ #include "lapic.h" #if NIOAPIC > 0 -#include <machine/i82093var.h> #include <machine/mpbiosvar.h> #endif diff --git a/sys/arch/amd64/amd64/ioapic.c b/sys/arch/amd64/amd64/ioapic.c index c18a1036cb5..876b1f518f5 100644 --- a/sys/arch/amd64/amd64/ioapic.c +++ b/sys/arch/amd64/amd64/ioapic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ioapic.c,v 1.22 2014/12/09 06:58:28 doug Exp $ */ +/* $OpenBSD: ioapic.c,v 1.23 2015/03/14 03:38:46 jsg Exp $ */ /* $NetBSD: ioapic.c,v 1.6 2003/05/15 13:30:31 fvdl Exp $ */ /*- @@ -77,7 +77,6 @@ #include <machine/i82093reg.h> #include <machine/i82093var.h> -#include <machine/i82489reg.h> #include <machine/i82489var.h> #include <machine/pmap.h> diff --git a/sys/arch/amd64/amd64/ipi.c b/sys/arch/amd64/amd64/ipi.c index 7894356fda9..8cb50892d66 100644 --- a/sys/arch/amd64/amd64/ipi.c +++ b/sys/arch/amd64/amd64/ipi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipi.c,v 1.13 2015/01/06 12:50:47 dlg Exp $ */ +/* $OpenBSD: ipi.c,v 1.14 2015/03/14 03:38:46 jsg Exp $ */ /* $NetBSD: ipi.c,v 1.2 2003/03/01 13:05:37 fvdl Exp $ */ /*- @@ -39,7 +39,6 @@ #include <machine/intr.h> #include <machine/atomic.h> #include <machine/cpuvar.h> -#include <machine/i82093var.h> #include <machine/i82489reg.h> #include <machine/i82489var.h> diff --git a/sys/arch/amd64/amd64/ipifuncs.c b/sys/arch/amd64/amd64/ipifuncs.c index 97613ed2180..0279d446ea5 100644 --- a/sys/arch/amd64/amd64/ipifuncs.c +++ b/sys/arch/amd64/amd64/ipifuncs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipifuncs.c,v 1.25 2014/07/11 10:56:52 mlarkin Exp $ */ +/* $OpenBSD: ipifuncs.c,v 1.26 2015/03/14 03:38:46 jsg Exp $ */ /* $NetBSD: ipifuncs.c,v 1.1 2003/04/26 18:39:28 fvdl Exp $ */ /*- @@ -52,7 +52,6 @@ #include <machine/fpu.h> #include <machine/mplock.h> -#include <ddb/db_output.h> #include <machine/db_machdep.h> void x86_64_ipi_nop(struct cpu_info *); diff --git a/sys/arch/amd64/amd64/k1x-pstate.c b/sys/arch/amd64/amd64/k1x-pstate.c index 5df35b0b096..3dddaf6e3db 100644 --- a/sys/arch/amd64/amd64/k1x-pstate.c +++ b/sys/arch/amd64/amd64/k1x-pstate.c @@ -1,4 +1,4 @@ -/* $OpenBSD: k1x-pstate.c,v 1.7 2014/09/14 14:17:23 jsg Exp $ */ +/* $OpenBSD: k1x-pstate.c,v 1.8 2015/03/14 03:38:46 jsg Exp $ */ /* * Copyright (c) 2011 Bryan Steele <brynet@gmail.com> * @@ -38,7 +38,6 @@ #if NACPICPU > 0 #include <dev/acpi/acpidev.h> -#include <dev/acpi/acpivar.h> #endif extern int setperf_prio; diff --git a/sys/arch/amd64/amd64/lapic.c b/sys/arch/amd64/amd64/lapic.c index bf8a0217967..174bffb583d 100644 --- a/sys/arch/amd64/amd64/lapic.c +++ b/sys/arch/amd64/amd64/lapic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lapic.c,v 1.37 2015/01/06 12:50:47 dlg Exp $ */ +/* $OpenBSD: lapic.c,v 1.38 2015/03/14 03:38:46 jsg Exp $ */ /* $NetBSD: lapic.c,v 1.2 2003/05/08 01:04:35 fvdl Exp $ */ /*- @@ -40,7 +40,6 @@ #include <machine/cpu.h> #include <machine/cpufunc.h> -#include <machine/cpuvar.h> #include <machine/pmap.h> #include <machine/vmparam.h> #include <machine/mpbiosvar.h> diff --git a/sys/arch/amd64/amd64/lock_machdep.c b/sys/arch/amd64/amd64/lock_machdep.c index b929f0ef564..a8e9946dee9 100644 --- a/sys/arch/amd64/amd64/lock_machdep.c +++ b/sys/arch/amd64/amd64/lock_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lock_machdep.c,v 1.7 2015/02/11 06:39:24 dlg Exp $ */ +/* $OpenBSD: lock_machdep.c,v 1.8 2015/03/14 03:38:46 jsg Exp $ */ /* * Copyright (c) 2007 Artur Grabowski <art@openbsd.org> @@ -24,8 +24,6 @@ #include <machine/lock.h> #include <machine/cpufunc.h> -#include <ddb/db_output.h> - void __mp_lock_init(struct __mp_lock *mpl) { diff --git a/sys/arch/amd64/amd64/machdep.c b/sys/arch/amd64/amd64/machdep.c index c7810aa9961..c81f814f042 100644 --- a/sys/arch/amd64/amd64/machdep.c +++ b/sys/arch/amd64/amd64/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.206 2015/01/12 16:33:31 deraadt Exp $ */ +/* $OpenBSD: machdep.c,v 1.207 2015/03/14 03:38:46 jsg Exp $ */ /* $NetBSD: machdep.c,v 1.3 2003/05/07 22:58:18 fvdl Exp $ */ /*- @@ -114,7 +114,6 @@ #include <dev/isa/isareg.h> #include <machine/isa_machdep.h> #include <dev/ic/i8042reg.h> -#include <amd64/isa/nvram.h> #ifdef DDB #include <machine/db_machdep.h> diff --git a/sys/arch/amd64/amd64/mainbus.c b/sys/arch/amd64/amd64/mainbus.c index 2742ca00bc2..b0dc4c04da4 100644 --- a/sys/arch/amd64/amd64/mainbus.c +++ b/sys/arch/amd64/amd64/mainbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mainbus.c,v 1.27 2013/05/30 16:15:01 deraadt Exp $ */ +/* $OpenBSD: mainbus.c,v 1.28 2015/03/14 03:38:46 jsg Exp $ */ /* $NetBSD: mainbus.c,v 1.1 2003/04/26 18:39:29 fvdl Exp $ */ /* @@ -53,7 +53,6 @@ #include <machine/cpuvar.h> #include <machine/i82093var.h> -#include <dev/acpi/acpireg.h> #include <dev/acpi/acpivar.h> #if NIPMI > 0 diff --git a/sys/arch/amd64/amd64/mem.c b/sys/arch/amd64/amd64/mem.c index 9836cfc3554..68a894488e2 100644 --- a/sys/arch/amd64/amd64/mem.c +++ b/sys/arch/amd64/amd64/mem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mem.c,v 1.22 2015/02/10 22:44:35 miod Exp $ */ +/* $OpenBSD: mem.c,v 1.23 2015/03/14 03:38:46 jsg Exp $ */ /* * Copyright (c) 1988 University of Utah. * Copyright (c) 1982, 1986, 1990, 1993 @@ -55,7 +55,6 @@ #include <sys/fcntl.h> #include <machine/cpu.h> -#include <machine/conf.h> #include <uvm/uvm_extern.h> diff --git a/sys/arch/amd64/amd64/mp_setperf.c b/sys/arch/amd64/amd64/mp_setperf.c index 9259e38be8c..6b33450e0b7 100644 --- a/sys/arch/amd64/amd64/mp_setperf.c +++ b/sys/arch/amd64/amd64/mp_setperf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mp_setperf.c,v 1.5 2014/09/12 09:52:45 kettenis Exp $ */ +/* $OpenBSD: mp_setperf.c,v 1.6 2015/03/14 03:38:46 jsg Exp $ */ /* * Copyright (c) 2007 Gordon Willem Klok <gwk@openbsd.org> * @@ -20,7 +20,6 @@ #include <sys/sysctl.h> #include <sys/mutex.h> -#include <machine/cpu.h> #include <machine/intr.h> struct mutex setperf_mp_mutex = MUTEX_INITIALIZER(IPL_HIGH); diff --git a/sys/arch/amd64/amd64/nvram.c b/sys/arch/amd64/amd64/nvram.c index 9795fa0a1b7..c3aa137e234 100644 --- a/sys/arch/amd64/amd64/nvram.c +++ b/sys/arch/amd64/amd64/nvram.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nvram.c,v 1.2 2015/02/10 21:56:08 miod Exp $ */ +/* $OpenBSD: nvram.c,v 1.3 2015/03/14 03:38:46 jsg Exp $ */ /* * Copyright (c) 2004 Joshua Stein <jcs@openbsd.org> @@ -32,7 +32,6 @@ #include <sys/conf.h> #include <dev/ic/mc146818reg.h> -#include <amd64/isa/nvram.h> /* checksum is calculated over bytes 2 to 31 and stored in byte 32 */ #define NVRAM_CSUM_START (MC_NVRAM_START + 2) diff --git a/sys/arch/amd64/amd64/pctr.c b/sys/arch/amd64/amd64/pctr.c index d2e1e794c42..734d6e238af 100644 --- a/sys/arch/amd64/amd64/pctr.c +++ b/sys/arch/amd64/amd64/pctr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pctr.c,v 1.5 2014/03/29 18:09:28 guenther Exp $ */ +/* $OpenBSD: pctr.c,v 1.6 2015/03/14 03:38:46 jsg Exp $ */ /* * Copyright (c) 2007 Mike Belopuhov @@ -32,7 +32,6 @@ #include <sys/ioccom.h> #include <sys/systm.h> -#include <machine/psl.h> #include <machine/pctr.h> #include <machine/cpu.h> #include <machine/specialreg.h> diff --git a/sys/arch/amd64/amd64/pmap.c b/sys/arch/amd64/amd64/pmap.c index 59f61290d10..8697ec31ae3 100644 --- a/sys/arch/amd64/amd64/pmap.c +++ b/sys/arch/amd64/amd64/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.89 2015/03/10 20:12:39 kettenis Exp $ */ +/* $OpenBSD: pmap.c,v 1.90 2015/03/14 03:38:46 jsg Exp $ */ /* $NetBSD: pmap.c,v 1.3 2003/05/08 18:13:13 thorpej Exp $ */ /* @@ -123,7 +123,6 @@ #endif -#include <dev/isa/isareg.h> #include <machine/isa_machdep.h> #include "acpi.h" diff --git a/sys/arch/amd64/amd64/powernow-k8.c b/sys/arch/amd64/amd64/powernow-k8.c index 284d9684963..74ea706b692 100644 --- a/sys/arch/amd64/amd64/powernow-k8.c +++ b/sys/arch/amd64/amd64/powernow-k8.c @@ -1,4 +1,4 @@ -/* $OpenBSD: powernow-k8.c,v 1.24 2014/09/14 14:17:23 jsg Exp $ */ +/* $OpenBSD: powernow-k8.c,v 1.25 2015/03/14 03:38:46 jsg Exp $ */ /* * Copyright (c) 2004 Martin Végiard. * Copyright (c) 2004-2005 Bruno Ducrot @@ -43,7 +43,6 @@ #if NACPICPU > 0 #include <dev/acpi/acpidev.h> -#include <dev/acpi/acpivar.h> #endif #define BIOS_START 0xe0000 diff --git a/sys/arch/amd64/amd64/process_machdep.c b/sys/arch/amd64/amd64/process_machdep.c index 8ad5444a44f..9b3f0f2198c 100644 --- a/sys/arch/amd64/amd64/process_machdep.c +++ b/sys/arch/amd64/amd64/process_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: process_machdep.c,v 1.11 2011/12/17 14:07:49 kettenis Exp $ */ +/* $OpenBSD: process_machdep.c,v 1.12 2015/03/14 03:38:46 jsg Exp $ */ /* $NetBSD: process_machdep.c,v 1.1 2003/04/26 18:39:31 fvdl Exp $ */ /*- @@ -66,7 +66,6 @@ #include <machine/psl.h> #include <machine/reg.h> -#include <machine/segments.h> #include <machine/fpu.h> static __inline struct trapframe *process_frame(struct proc *); diff --git a/sys/arch/amd64/amd64/rbus_machdep.c b/sys/arch/amd64/amd64/rbus_machdep.c index db4d27ed5d1..d40b7732cc3 100644 --- a/sys/arch/amd64/amd64/rbus_machdep.c +++ b/sys/arch/amd64/amd64/rbus_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rbus_machdep.c,v 1.12 2010/09/22 02:28:37 jsg Exp $ */ +/* $OpenBSD: rbus_machdep.c,v 1.13 2015/03/14 03:38:46 jsg Exp $ */ /* $NetBSD: rbus_machdep.c,v 1.2 1999/10/15 06:43:06 haya Exp $ */ /* @@ -28,7 +28,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/device.h> #include <sys/extent.h> #include <uvm/uvm_extern.h> diff --git a/sys/arch/amd64/amd64/sys_machdep.c b/sys/arch/amd64/amd64/sys_machdep.c index 13ece85d01f..97af7d80a5f 100644 --- a/sys/arch/amd64/amd64/sys_machdep.c +++ b/sys/arch/amd64/amd64/sys_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sys_machdep.c,v 1.14 2013/06/02 16:38:05 guenther Exp $ */ +/* $OpenBSD: sys_machdep.c,v 1.15 2015/03/14 03:38:46 jsg Exp $ */ /* $NetBSD: sys_machdep.c,v 1.1 2003/04/26 18:39:32 fvdl Exp $ */ /*- @@ -47,7 +47,6 @@ #include <uvm/uvm_extern.h> -#include <machine/cpu.h> #include <machine/cpufunc.h> #include <machine/psl.h> #include <machine/reg.h> diff --git a/sys/arch/amd64/amd64/trap.c b/sys/arch/amd64/amd64/trap.c index 59775682c6a..473273c3262 100644 --- a/sys/arch/amd64/amd64/trap.c +++ b/sys/arch/amd64/amd64/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.43 2014/11/16 12:30:56 deraadt Exp $ */ +/* $OpenBSD: trap.c,v 1.44 2015/03/14 03:38:46 jsg Exp $ */ /* $NetBSD: trap.c,v 1.2 2003/05/04 23:51:56 fvdl Exp $ */ /*- @@ -86,7 +86,6 @@ #include <machine/cpufunc.h> #include <machine/fpu.h> #include <machine/psl.h> -#include <machine/reg.h> #include <machine/trap.h> #ifdef DDB #include <machine/db_machdep.h> diff --git a/sys/arch/amd64/amd64/via.c b/sys/arch/amd64/amd64/via.c index 23ab6fc3a2b..9a915f1a9d4 100644 --- a/sys/arch/amd64/amd64/via.c +++ b/sys/arch/amd64/amd64/via.c @@ -1,4 +1,4 @@ -/* $OpenBSD: via.c,v 1.19 2014/12/15 01:53:45 tedu Exp $ */ +/* $OpenBSD: via.c,v 1.20 2015/03/14 03:38:46 jsg Exp $ */ /* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- @@ -50,7 +50,6 @@ #include <machine/psl.h> #include <machine/reg.h> #include <machine/specialreg.h> -#include <machine/biosvar.h> #include <dev/rndvar.h> diff --git a/sys/arch/amd64/amd64/vm_machdep.c b/sys/arch/amd64/amd64/vm_machdep.c index f1c135e03cf..eb609a4a987 100644 --- a/sys/arch/amd64/amd64/vm_machdep.c +++ b/sys/arch/amd64/amd64/vm_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vm_machdep.c,v 1.29 2014/11/16 12:30:56 deraadt Exp $ */ +/* $OpenBSD: vm_machdep.c,v 1.30 2015/03/14 03:38:46 jsg Exp $ */ /* $NetBSD: vm_machdep.c,v 1.1 2003/04/26 18:39:33 fvdl Exp $ */ /*- @@ -58,7 +58,6 @@ #include <machine/cpu.h> #include <machine/reg.h> -#include <machine/specialreg.h> #include <machine/fpu.h> void setredzone(struct proc *); diff --git a/sys/arch/amd64/isa/clock.c b/sys/arch/amd64/isa/clock.c index 367da948157..06026355353 100644 --- a/sys/arch/amd64/isa/clock.c +++ b/sys/arch/amd64/isa/clock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clock.c,v 1.21 2014/03/29 18:09:28 guenther Exp $ */ +/* $OpenBSD: clock.c,v 1.22 2015/03/14 03:38:46 jsg Exp $ */ /* $NetBSD: clock.c,v 1.1 2003/04/26 18:39:50 fvdl Exp $ */ /*- @@ -107,7 +107,6 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <dev/ic/mc146818reg.h> #include <dev/ic/i8253reg.h> #include <amd64/isa/nvram.h> -#include <dev/clock_subr.h> #include <machine/specialreg.h> /* Timecounter on the i8254 */ diff --git a/sys/arch/amd64/isa/isa_machdep.c b/sys/arch/amd64/isa/isa_machdep.c index 8197caa7008..b79d5aa6b51 100644 --- a/sys/arch/amd64/isa/isa_machdep.c +++ b/sys/arch/amd64/isa/isa_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isa_machdep.c,v 1.26 2015/01/24 15:13:55 kettenis Exp $ */ +/* $OpenBSD: isa_machdep.c,v 1.27 2015/03/14 03:38:46 jsg Exp $ */ /* $NetBSD: isa_machdep.c,v 1.22 1997/06/12 23:57:32 thorpej Exp $ */ #define ISA_DMA_STATS @@ -92,7 +92,6 @@ #include <machine/cpufunc.h> #include <machine/i8259.h> -#include <dev/isa/isareg.h> #include <dev/isa/isavar.h> #if 0 #include <dev/isa/isadmavar.h> diff --git a/sys/arch/amd64/pci/aapic.c b/sys/arch/amd64/pci/aapic.c index 0f5db0015d8..6862f3a66b6 100644 --- a/sys/arch/amd64/pci/aapic.c +++ b/sys/arch/amd64/pci/aapic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aapic.c,v 1.5 2008/04/24 20:47:05 thib Exp $ */ +/* $OpenBSD: aapic.c,v 1.6 2015/03/14 03:38:46 jsg Exp $ */ /* $NetBSD: aapic.c,v 1.3 2005/01/13 23:40:01 fvdl Exp $ */ /* @@ -6,7 +6,6 @@ */ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/device.h> #include <dev/pci/pcireg.h> diff --git a/sys/arch/amd64/pci/agp_machdep.c b/sys/arch/amd64/pci/agp_machdep.c index a09549469a4..973a277cb01 100644 --- a/sys/arch/amd64/pci/agp_machdep.c +++ b/sys/arch/amd64/pci/agp_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: agp_machdep.c,v 1.13 2014/09/20 16:15:16 kettenis Exp $ */ +/* $OpenBSD: agp_machdep.c,v 1.14 2015/03/14 03:38:46 jsg Exp $ */ /* * Copyright (c) 2008 - 2009 Owain G. Ainsworth <oga@openbsd.org> @@ -49,7 +49,6 @@ #include <dev/pci/pcivar.h> #include <dev/pci/pcireg.h> #include <dev/pci/pcidevs.h> -#include <dev/pci/agpvar.h> #include <uvm/uvm_extern.h> diff --git a/sys/arch/amd64/pci/pci_machdep.c b/sys/arch/amd64/pci/pci_machdep.c index d854cc3e237..37532dabc16 100644 --- a/sys/arch/amd64/pci/pci_machdep.c +++ b/sys/arch/amd64/pci/pci_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_machdep.c,v 1.61 2015/01/24 15:13:55 kettenis Exp $ */ +/* $OpenBSD: pci_machdep.c,v 1.62 2015/03/14 03:38:46 jsg Exp $ */ /* $NetBSD: pci_machdep.c,v 1.3 2003/05/07 21:33:58 fvdl Exp $ */ /*- @@ -83,7 +83,6 @@ #include <machine/biosvar.h> #include <dev/isa/isareg.h> -#include <dev/isa/isavar.h> #include <dev/pci/pcivar.h> #include <dev/pci/pcireg.h> #include <dev/pci/pcidevs.h> diff --git a/sys/arch/amd64/pci/vga_post.c b/sys/arch/amd64/pci/vga_post.c index cdb04147cc2..076eeb5b07c 100644 --- a/sys/arch/amd64/pci/vga_post.c +++ b/sys/arch/amd64/pci/vga_post.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vga_post.c,v 1.8 2014/11/16 12:30:56 deraadt Exp $ */ +/* $OpenBSD: vga_post.c,v 1.9 2015/03/14 03:38:46 jsg Exp $ */ /* $NetBSD: vga_post.c,v 1.12 2009/03/15 21:32:36 cegger Exp $ */ /*- @@ -37,7 +37,6 @@ #include <uvm/uvm_extern.h> #include <machine/pio.h> -#include <machine/vga_post.h> #include <dev/x86emu/x86emu.h> #include <dev/x86emu/x86emu_regs.h> diff --git a/sys/compat/common/compat_util.c b/sys/compat/common/compat_util.c index f2121d8a417..9f188d154e4 100644 --- a/sys/compat/common/compat_util.c +++ b/sys/compat/common/compat_util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: compat_util.c,v 1.15 2015/01/26 22:51:37 kettenis Exp $ */ +/* $OpenBSD: compat_util.c,v 1.16 2015/03/14 03:38:46 jsg Exp $ */ /* $NetBSD: compat_util.c,v 1.4 1996/03/14 19:31:45 christos Exp $ */ /* @@ -34,7 +34,6 @@ #include <sys/systm.h> #include <sys/namei.h> #include <sys/proc.h> -#include <sys/file.h> #include <sys/stat.h> #include <sys/filedesc.h> #include <sys/ioctl.h> diff --git a/sys/crypto/criov.c b/sys/crypto/criov.c index 8b285efd203..dc39e3b57b7 100644 --- a/sys/crypto/criov.c +++ b/sys/crypto/criov.c @@ -1,4 +1,4 @@ -/* $OpenBSD: criov.c,v 1.19 2014/09/14 14:17:23 jsg Exp $ */ +/* $OpenBSD: criov.c,v 1.20 2015/03/14 03:38:46 jsg Exp $ */ /* * Copyright (c) 1999 Theo de Raadt @@ -31,8 +31,6 @@ #include <sys/kernel.h> #include <sys/mbuf.h> -#include <crypto/cryptodev.h> - void cuio_copydata(struct uio *uio, int off, int len, caddr_t cp) { diff --git a/sys/crypto/cryptosoft.c b/sys/crypto/cryptosoft.c index 2f5166b681a..ccc2d4a3a1b 100644 --- a/sys/crypto/cryptosoft.c +++ b/sys/crypto/cryptosoft.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cryptosoft.c,v 1.72 2014/12/28 10:02:37 tedu Exp $ */ +/* $OpenBSD: cryptosoft.c,v 1.73 2015/03/14 03:38:46 jsg Exp $ */ /* * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu) @@ -31,7 +31,6 @@ #include <crypto/sha1.h> #include <crypto/rmd160.h> #include <crypto/cast.h> -#include <crypto/blf.h> #include <crypto/cryptodev.h> #include <crypto/cryptosoft.h> #include <crypto/xform.h> diff --git a/sys/crypto/idgen.c b/sys/crypto/idgen.c index 7b639637f63..f994f2a9851 100644 --- a/sys/crypto/idgen.c +++ b/sys/crypto/idgen.c @@ -25,8 +25,6 @@ #include <sys/systm.h> #include <sys/time.h> -#include <dev/rndvar.h> - #include <crypto/idgen.h> static const u_int8_t idgen32_ftable[256] = { diff --git a/sys/crypto/sha2.c b/sys/crypto/sha2.c index 1619919fa3c..63a9ae594fc 100644 --- a/sys/crypto/sha2.c +++ b/sys/crypto/sha2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sha2.c,v 1.17 2014/12/31 16:56:55 tedu Exp $ */ +/* $OpenBSD: sha2.c,v 1.18 2015/03/14 03:38:46 jsg Exp $ */ /* * FILE: sha2.c @@ -34,7 +34,6 @@ * $From: sha2.c,v 1.1 2001/11/08 00:01:51 adg Exp adg $ */ -#include <sys/param.h> #include <sys/time.h> #include <sys/systm.h> #include <crypto/sha2.h> diff --git a/sys/crypto/xform.c b/sys/crypto/xform.c index 55957518b3f..124e25973f5 100644 --- a/sys/crypto/xform.c +++ b/sys/crypto/xform.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xform.c,v 1.45 2014/12/28 10:02:37 tedu Exp $ */ +/* $OpenBSD: xform.c,v 1.46 2015/03/14 03:38:46 jsg Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), * Angelos D. Keromytis (kermit@csd.uch.gr), @@ -57,7 +57,6 @@ #include <crypto/rijndael.h> #include <crypto/cryptodev.h> #include <crypto/xform.h> -#include <lib/libz/zlib.h> #include <crypto/gmac.h> extern void des_ecb3_encrypt(caddr_t, caddr_t, caddr_t, caddr_t, caddr_t, int); diff --git a/sys/crypto/xform_ipcomp.c b/sys/crypto/xform_ipcomp.c index 4c1948d8ce9..145badd0b51 100644 --- a/sys/crypto/xform_ipcomp.c +++ b/sys/crypto/xform_ipcomp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xform_ipcomp.c,v 1.4 2014/07/12 18:50:00 tedu Exp $ */ +/* $OpenBSD: xform_ipcomp.c,v 1.5 2015/03/14 03:38:46 jsg Exp $ */ /* * Copyright (c) 2001 Jean-Jacques Bernard-Gundol (jj@wabbitt.org) @@ -34,7 +34,6 @@ #include <sys/types.h> #include <sys/malloc.h> -#include <sys/param.h> #include <sys/systm.h> #include <lib/libz/zutil.h> diff --git a/sys/ddb/db_break.c b/sys/ddb/db_break.c index 1d5feafdbba..ca3ec1e45c6 100644 --- a/sys/ddb/db_break.c +++ b/sys/ddb/db_break.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_break.c,v 1.16 2014/09/14 14:17:24 jsg Exp $ */ +/* $OpenBSD: db_break.c,v 1.17 2015/03/14 03:38:46 jsg Exp $ */ /* $NetBSD: db_break.c,v 1.7 1996/03/30 22:30:03 christos Exp $ */ /* @@ -38,7 +38,6 @@ #include <machine/db_machdep.h> /* type definitions */ -#include <ddb/db_lex.h> #include <ddb/db_access.h> #include <ddb/db_sym.h> #include <ddb/db_break.h> diff --git a/sys/ddb/db_command.c b/sys/ddb/db_command.c index 8c1c5945331..19cff322be0 100644 --- a/sys/ddb/db_command.c +++ b/sys/ddb/db_command.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_command.c,v 1.64 2014/07/11 14:36:44 uebayasi Exp $ */ +/* $OpenBSD: db_command.c,v 1.65 2015/03/14 03:38:46 jsg Exp $ */ /* $NetBSD: db_command.c,v 1.20 1996/03/30 22:30:05 christos Exp $ */ /* @@ -51,7 +51,6 @@ #include <ddb/db_run.h> #include <ddb/db_variables.h> #include <ddb/db_interface.h> -#include <ddb/db_sym.h> #include <ddb/db_extern.h> #include <uvm/uvm_ddb.h> diff --git a/sys/ddb/db_elf.c b/sys/ddb/db_elf.c index 9ccb5f3fb98..c5bc1546d01 100644 --- a/sys/ddb/db_elf.c +++ b/sys/ddb/db_elf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_elf.c,v 1.12 2014/10/09 08:21:48 matthew Exp $ */ +/* $OpenBSD: db_elf.c,v 1.13 2015/03/14 03:38:46 jsg Exp $ */ /* $NetBSD: db_elf.c,v 1.13 2000/07/07 21:55:18 jhawk Exp $ */ /*- @@ -42,7 +42,6 @@ #include <ddb/db_dwarf.h> #include <ddb/db_sym.h> #include <ddb/db_output.h> -#include <ddb/db_extern.h> #include <sys/exec_elf.h> diff --git a/sys/ddb/db_hangman.c b/sys/ddb/db_hangman.c index 55e49236dc0..bcdad460abc 100644 --- a/sys/ddb/db_hangman.c +++ b/sys/ddb/db_hangman.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_hangman.c,v 1.31 2014/11/18 02:37:30 tedu Exp $ */ +/* $OpenBSD: db_hangman.c,v 1.32 2015/03/14 03:38:46 jsg Exp $ */ /* * Copyright (c) 1996 Theo de Raadt, Michael Shalayeff @@ -32,7 +32,6 @@ #include <machine/db_machdep.h> #include <ddb/db_sym.h> -#include <ddb/db_extern.h> #include <ddb/db_output.h> #include <dev/cons.h> diff --git a/sys/ddb/db_input.c b/sys/ddb/db_input.c index 6889c07b861..729311ef75d 100644 --- a/sys/ddb/db_input.c +++ b/sys/ddb/db_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_input.c,v 1.13 2014/09/14 14:17:24 jsg Exp $ */ +/* $OpenBSD: db_input.c,v 1.14 2015/03/14 03:38:46 jsg Exp $ */ /* $NetBSD: db_input.c,v 1.7 1996/02/05 01:57:02 christos Exp $ */ /* @@ -37,7 +37,6 @@ #include <ddb/db_var.h> #include <ddb/db_output.h> -#include <ddb/db_command.h> #include <ddb/db_sym.h> #include <ddb/db_extern.h> diff --git a/sys/ddb/db_lex.c b/sys/ddb/db_lex.c index 49e34db6f6b..4cd2297f297 100644 --- a/sys/ddb/db_lex.c +++ b/sys/ddb/db_lex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_lex.c,v 1.11 2014/09/14 14:17:24 jsg Exp $ */ +/* $OpenBSD: db_lex.c,v 1.12 2015/03/14 03:38:46 jsg Exp $ */ /* $NetBSD: db_lex.c,v 1.8 1996/02/05 01:57:05 christos Exp $ */ /* @@ -41,7 +41,6 @@ #include <ddb/db_lex.h> #include <ddb/db_output.h> #include <ddb/db_command.h> -#include <ddb/db_sym.h> #include <ddb/db_extern.h> #include <ddb/db_var.h> diff --git a/sys/ddb/db_output.c b/sys/ddb/db_output.c index a6ae75af67f..d0ac6cfe5f5 100644 --- a/sys/ddb/db_output.c +++ b/sys/ddb/db_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_output.c,v 1.28 2014/09/14 14:17:24 jsg Exp $ */ +/* $OpenBSD: db_output.c,v 1.29 2015/03/14 03:38:46 jsg Exp $ */ /* $NetBSD: db_output.c,v 1.13 1996/04/01 17:27:14 christos Exp $ */ /* @@ -43,7 +43,6 @@ #include <ddb/db_interface.h> #include <ddb/db_sym.h> #include <ddb/db_var.h> -#include <ddb/db_extern.h> /* * Character output - tracks position in line. diff --git a/sys/ddb/db_print.c b/sys/ddb/db_print.c index 0f459c72b6f..8879af7a30c 100644 --- a/sys/ddb/db_print.c +++ b/sys/ddb/db_print.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_print.c,v 1.14 2014/09/14 14:17:24 jsg Exp $ */ +/* $OpenBSD: db_print.c,v 1.15 2015/03/14 03:38:46 jsg Exp $ */ /* $NetBSD: db_print.c,v 1.5 1996/02/05 01:57:11 christos Exp $ */ /* @@ -38,7 +38,6 @@ #include <machine/db_machdep.h> -#include <ddb/db_lex.h> #include <ddb/db_variables.h> #include <ddb/db_sym.h> #include <ddb/db_output.h> diff --git a/sys/ddb/db_run.c b/sys/ddb/db_run.c index 4426753233b..fb427ad47ff 100644 --- a/sys/ddb/db_run.c +++ b/sys/ddb/db_run.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_run.c,v 1.24 2014/09/14 14:17:24 jsg Exp $ */ +/* $OpenBSD: db_run.c,v 1.25 2015/03/14 03:38:46 jsg Exp $ */ /* $NetBSD: db_run.c,v 1.8 1996/02/05 01:57:12 christos Exp $ */ /* @@ -51,7 +51,6 @@ int db_inst_count; #ifndef KGDB -#include <ddb/db_lex.h> #include <ddb/db_watch.h> #include <ddb/db_output.h> #include <ddb/db_sym.h> diff --git a/sys/ddb/db_sym.c b/sys/ddb/db_sym.c index 5c209778f85..1e35a097f53 100644 --- a/sys/ddb/db_sym.c +++ b/sys/ddb/db_sym.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_sym.c,v 1.36 2014/12/21 16:27:08 mlarkin Exp $ */ +/* $OpenBSD: db_sym.c,v 1.37 2015/03/14 03:38:46 jsg Exp $ */ /* $NetBSD: db_sym.c,v 1.24 2000/08/11 22:50:47 tv Exp $ */ /* @@ -35,7 +35,6 @@ #include <ddb/db_lex.h> #include <ddb/db_sym.h> #include <ddb/db_output.h> -#include <ddb/db_extern.h> #include <ddb/db_command.h> /* diff --git a/sys/ddb/db_trap.c b/sys/ddb/db_trap.c index 0fb7d01ea3e..43f48af74f4 100644 --- a/sys/ddb/db_trap.c +++ b/sys/ddb/db_trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_trap.c,v 1.18 2014/09/14 14:17:24 jsg Exp $ */ +/* $OpenBSD: db_trap.c,v 1.19 2015/03/14 03:38:46 jsg Exp $ */ /* $NetBSD: db_trap.c,v 1.9 1996/02/05 01:57:18 christos Exp $ */ /* @@ -40,7 +40,6 @@ #include <ddb/db_run.h> #include <ddb/db_command.h> -#include <ddb/db_break.h> #include <ddb/db_output.h> #include <ddb/db_sym.h> #include <ddb/db_extern.h> diff --git a/sys/ddb/db_usrreq.c b/sys/ddb/db_usrreq.c index e7d77a35457..c574dc24930 100644 --- a/sys/ddb/db_usrreq.c +++ b/sys/ddb/db_usrreq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_usrreq.c,v 1.16 2014/07/08 13:02:57 deraadt Exp $ */ +/* $OpenBSD: db_usrreq.c,v 1.17 2015/03/14 03:38:46 jsg Exp $ */ /* * Copyright (c) 1996 Michael Shalayeff. All rights reserved. @@ -27,7 +27,6 @@ #include <sys/param.h> #include <sys/types.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/proc.h> #include <sys/tty.h> #include <sys/sysctl.h> diff --git a/sys/ddb/db_variables.c b/sys/ddb/db_variables.c index 28d79da2359..96895784236 100644 --- a/sys/ddb/db_variables.c +++ b/sys/ddb/db_variables.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_variables.c,v 1.15 2014/09/14 14:17:24 jsg Exp $ */ +/* $OpenBSD: db_variables.c,v 1.16 2015/03/14 03:38:46 jsg Exp $ */ /* $NetBSD: db_variables.c,v 1.8 1996/02/05 01:57:19 christos Exp $ */ /* @@ -28,7 +28,6 @@ */ #include <sys/param.h> -#include <sys/systm.h> #include <machine/db_machdep.h> diff --git a/sys/ddb/db_watch.c b/sys/ddb/db_watch.c index 960a4af0aa4..b08c4c986c7 100644 --- a/sys/ddb/db_watch.c +++ b/sys/ddb/db_watch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_watch.c,v 1.13 2014/11/16 12:30:59 deraadt Exp $ */ +/* $OpenBSD: db_watch.c,v 1.14 2015/03/14 03:38:46 jsg Exp $ */ /* $NetBSD: db_watch.c,v 1.9 1996/03/30 22:30:12 christos Exp $ */ /* @@ -38,7 +38,6 @@ #include <ddb/db_break.h> #include <ddb/db_watch.h> #include <ddb/db_lex.h> -#include <ddb/db_access.h> #include <ddb/db_run.h> #include <ddb/db_sym.h> #include <ddb/db_output.h> diff --git a/sys/ddb/db_write_cmd.c b/sys/ddb/db_write_cmd.c index b65edc593a3..383a985b588 100644 --- a/sys/ddb/db_write_cmd.c +++ b/sys/ddb/db_write_cmd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_write_cmd.c,v 1.13 2014/09/14 14:17:24 jsg Exp $ */ +/* $OpenBSD: db_write_cmd.c,v 1.14 2015/03/14 03:38:46 jsg Exp $ */ /* $NetBSD: db_write_cmd.c,v 1.6 1996/02/05 01:57:25 christos Exp $ */ /* @@ -35,7 +35,6 @@ #include <machine/db_machdep.h> -#include <ddb/db_lex.h> #include <ddb/db_access.h> #include <ddb/db_command.h> #include <ddb/db_sym.h> diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c index 5129b4ac94b..a1c3528c35d 100644 --- a/sys/dev/acpi/acpi.c +++ b/sys/dev/acpi/acpi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpi.c,v 1.283 2015/02/07 01:19:40 deraadt Exp $ */ +/* $OpenBSD: acpi.c,v 1.284 2015/03/14 03:38:46 jsg Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org> @@ -51,7 +51,6 @@ #include <dev/pci/pcidevs.h> #include <dev/pci/ppbreg.h> -#include <dev/pci/pciidereg.h> #include <dev/pci/pciidevar.h> #include <machine/apmvar.h> diff --git a/sys/dev/acpi/acpiac.c b/sys/dev/acpi/acpiac.c index d4b48cf0780..48b13b5cb1a 100644 --- a/sys/dev/acpi/acpiac.c +++ b/sys/dev/acpi/acpiac.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpiac.c,v 1.28 2010/08/07 16:55:38 canacar Exp $ */ +/* $OpenBSD: acpiac.c,v 1.29 2015/03/14 03:38:46 jsg Exp $ */ /* * Copyright (c) 2005 Marco Peereboom <marco@openbsd.org> * @@ -27,7 +27,6 @@ #include <dev/acpi/acpireg.h> #include <dev/acpi/acpivar.h> #include <dev/acpi/acpidev.h> -#include <dev/acpi/amltypes.h> #include <dev/acpi/dsdt.h> #include <sys/sensors.h> diff --git a/sys/dev/acpi/acpibat.c b/sys/dev/acpi/acpibat.c index f7b144e62af..c0132398218 100644 --- a/sys/dev/acpi/acpibat.c +++ b/sys/dev/acpi/acpibat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpibat.c,v 1.61 2014/09/14 14:17:24 jsg Exp $ */ +/* $OpenBSD: acpibat.c,v 1.62 2015/03/14 03:38:46 jsg Exp $ */ /* * Copyright (c) 2005 Marco Peereboom <marco@openbsd.org> * @@ -21,7 +21,6 @@ #include <sys/malloc.h> #include <sys/sensors.h> -#include <machine/bus.h> #include <machine/apmvar.h> #include <dev/acpi/acpireg.h> diff --git a/sys/dev/acpi/acpicpu.c b/sys/dev/acpi/acpicpu.c index e2016024ee5..de216435c77 100644 --- a/sys/dev/acpi/acpicpu.c +++ b/sys/dev/acpi/acpicpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpicpu.c,v 1.62 2014/12/09 06:58:29 doug Exp $ */ +/* $OpenBSD: acpicpu.c,v 1.63 2015/03/14 03:38:46 jsg Exp $ */ /* * Copyright (c) 2005 Marco Peereboom <marco@openbsd.org> * @@ -25,7 +25,6 @@ #include <machine/bus.h> #include <machine/cpu.h> -#include <machine/cpufunc.h> #include <machine/specialreg.h> #include <dev/acpi/acpireg.h> diff --git a/sys/dev/acpi/acpidebug.c b/sys/dev/acpi/acpidebug.c index 0177ceab7f2..f997be1f428 100644 --- a/sys/dev/acpi/acpidebug.c +++ b/sys/dev/acpi/acpidebug.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpidebug.c,v 1.29 2013/12/12 21:00:09 guenther Exp $ */ +/* $OpenBSD: acpidebug.c,v 1.30 2015/03/14 03:38:46 jsg Exp $ */ /* * Copyright (c) 2006 Marco Peereboom <marco@openbsd.org> * @@ -16,7 +16,6 @@ */ #include <machine/db_machdep.h> -#include <ddb/db_command.h> #include <ddb/db_output.h> #include <ddb/db_extern.h> #include <ddb/db_lex.h> diff --git a/sys/dev/acpi/acpidock.c b/sys/dev/acpi/acpidock.c index 0f82f19a226..f2823498268 100644 --- a/sys/dev/acpi/acpidock.c +++ b/sys/dev/acpi/acpidock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpidock.c,v 1.43 2014/08/21 21:49:37 kspillner Exp $ */ +/* $OpenBSD: acpidock.c,v 1.44 2015/03/14 03:38:46 jsg Exp $ */ /* * Copyright (c) 2006,2007 Michael Knudsen <mk@openbsd.org> * @@ -23,7 +23,6 @@ #include <machine/bus.h> -#include <dev/acpi/acpireg.h> #include <dev/acpi/acpivar.h> #include <dev/acpi/acpidev.h> #include <dev/acpi/amltypes.h> diff --git a/sys/dev/acpi/acpiec.c b/sys/dev/acpi/acpiec.c index 380d0013d32..e1003efcfa4 100644 --- a/sys/dev/acpi/acpiec.c +++ b/sys/dev/acpi/acpiec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpiec.c,v 1.51 2014/09/14 14:17:24 jsg Exp $ */ +/* $OpenBSD: acpiec.c,v 1.52 2015/03/14 03:38:46 jsg Exp $ */ /* * Copyright (c) 2006 Can Erkin Acar <canacar@openbsd.org> * @@ -19,7 +19,6 @@ #include <sys/signalvar.h> #include <sys/systm.h> #include <sys/device.h> -#include <sys/malloc.h> #include <machine/bus.h> diff --git a/sys/dev/acpi/acpihpet.c b/sys/dev/acpi/acpihpet.c index ffa0cd26979..78285c21b2f 100644 --- a/sys/dev/acpi/acpihpet.c +++ b/sys/dev/acpi/acpihpet.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpihpet.c,v 1.17 2014/03/05 23:47:00 deraadt Exp $ */ +/* $OpenBSD: acpihpet.c,v 1.18 2015/03/14 03:38:46 jsg Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * @@ -18,7 +18,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> -#include <sys/malloc.h> #include <sys/timetc.h> #include <machine/bus.h> diff --git a/sys/dev/acpi/acpiprt.c b/sys/dev/acpi/acpiprt.c index 222dd620849..00cd745a16e 100644 --- a/sys/dev/acpi/acpiprt.c +++ b/sys/dev/acpi/acpiprt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpiprt.c,v 1.46 2014/09/14 14:17:24 jsg Exp $ */ +/* $OpenBSD: acpiprt.c,v 1.47 2015/03/14 03:38:46 jsg Exp $ */ /* * Copyright (c) 2006 Mark Kettenis <kettenis@openbsd.org> * @@ -30,7 +30,6 @@ #include <dev/acpi/dsdt.h> #include <dev/pci/pcivar.h> -#include <dev/pci/pcidevs.h> #include <dev/pci/ppbreg.h> #include <machine/i82093reg.h> diff --git a/sys/dev/acpi/acpitimer.c b/sys/dev/acpi/acpitimer.c index 11285b54ab3..fb78acf2564 100644 --- a/sys/dev/acpi/acpitimer.c +++ b/sys/dev/acpi/acpitimer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpitimer.c,v 1.10 2012/08/16 18:41:17 tedu Exp $ */ +/* $OpenBSD: acpitimer.c,v 1.11 2015/03/14 03:38:46 jsg Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * @@ -18,7 +18,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> -#include <sys/malloc.h> #include <sys/timetc.h> #include <machine/bus.h> diff --git a/sys/dev/acpi/acpitoshiba.c b/sys/dev/acpi/acpitoshiba.c index bd66a6b4376..a57dae7254e 100644 --- a/sys/dev/acpi/acpitoshiba.c +++ b/sys/dev/acpi/acpitoshiba.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpitoshiba.c,v 1.3 2014/09/14 14:17:24 jsg Exp $ */ +/* $OpenBSD: acpitoshiba.c,v 1.4 2015/03/14 03:38:46 jsg Exp $ */ /*- * Copyright (c) 2003 Hiroyuki Aizu <aizu@navi.org> * All rights reserved. @@ -28,7 +28,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <dev/acpi/acpireg.h> #include <dev/acpi/acpivar.h> #include <dev/acpi/acpidev.h> #include <dev/acpi/amltypes.h> diff --git a/sys/dev/acpi/acpitz.c b/sys/dev/acpi/acpitz.c index 38aaeeab0f8..c312a9c6ca6 100644 --- a/sys/dev/acpi/acpitz.c +++ b/sys/dev/acpi/acpitz.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpitz.c,v 1.47 2014/07/12 02:44:49 mlarkin Exp $ */ +/* $OpenBSD: acpitz.c,v 1.48 2015/03/14 03:38:46 jsg Exp $ */ /* * Copyright (c) 2006 Can Erkin Acar <canacar@openbsd.org> * Copyright (c) 2005 Marco Peereboom <marco@openbsd.org> @@ -27,7 +27,6 @@ #include <machine/bus.h> -#include <dev/acpi/acpireg.h> #include <dev/acpi/acpivar.h> #include <dev/acpi/acpidev.h> #include <dev/acpi/amltypes.h> diff --git a/sys/dev/acpi/acpiutil.c b/sys/dev/acpi/acpiutil.c index 27cff9493e5..0fb21a3450b 100644 --- a/sys/dev/acpi/acpiutil.c +++ b/sys/dev/acpi/acpiutil.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpiutil.c,v 1.7 2010/07/13 21:10:50 deraadt Exp $ */ +/* $OpenBSD: acpiutil.c,v 1.8 2015/03/14 03:38:47 jsg Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * @@ -19,7 +19,6 @@ #include <sys/systm.h> #include <sys/device.h> -#include <dev/acpi/acpireg.h> #include <dev/acpi/acpivar.h> u_int diff --git a/sys/dev/acpi/acpivideo.c b/sys/dev/acpi/acpivideo.c index 9609f92c968..854e9981599 100644 --- a/sys/dev/acpi/acpivideo.c +++ b/sys/dev/acpi/acpivideo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpivideo.c,v 1.9 2011/05/23 11:58:40 pirofti Exp $ */ +/* $OpenBSD: acpivideo.c,v 1.10 2015/03/14 03:38:47 jsg Exp $ */ /* * Copyright (c) 2008 Federico G. Schwindt <fgsch@openbsd.org> * Copyright (c) 2009 Paul Irofti <pirofti@openbsd.org> @@ -22,7 +22,6 @@ #include <machine/bus.h> -#include <dev/acpi/acpireg.h> #include <dev/acpi/acpivar.h> #include <dev/acpi/acpidev.h> #include <dev/acpi/amltypes.h> diff --git a/sys/dev/acpi/acpivout.c b/sys/dev/acpi/acpivout.c index ccb1d787241..a0b04d41d90 100644 --- a/sys/dev/acpi/acpivout.c +++ b/sys/dev/acpi/acpivout.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpivout.c,v 1.10 2014/12/09 06:58:29 doug Exp $ */ +/* $OpenBSD: acpivout.c,v 1.11 2015/03/14 03:38:47 jsg Exp $ */ /* * Copyright (c) 2009 Paul Irofti <pirofti@openbsd.org> * @@ -22,7 +22,6 @@ #include <machine/bus.h> -#include <dev/acpi/acpireg.h> #include <dev/acpi/acpivar.h> #include <dev/acpi/acpidev.h> #include <dev/acpi/amltypes.h> diff --git a/sys/dev/acpi/dsdt.c b/sys/dev/acpi/dsdt.c index ee2498f606d..00155cf8f8e 100644 --- a/sys/dev/acpi/dsdt.c +++ b/sys/dev/acpi/dsdt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dsdt.c,v 1.214 2014/09/14 14:17:24 jsg Exp $ */ +/* $OpenBSD: dsdt.c,v 1.215 2015/03/14 03:38:47 jsg Exp $ */ /* * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org> * @@ -25,7 +25,6 @@ #ifdef DDB #include <machine/db_machdep.h> -#include <ddb/db_command.h> #endif #include <dev/acpi/acpireg.h> diff --git a/sys/dev/ata/ata.c b/sys/dev/ata/ata.c index dd667b4c0f2..67df9e69d3b 100644 --- a/sys/dev/ata/ata.c +++ b/sys/dev/ata/ata.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ata.c,v 1.33 2011/06/22 14:17:01 krw Exp $ */ +/* $OpenBSD: ata.c,v 1.34 2015/03/14 03:38:47 jsg Exp $ */ /* $NetBSD: ata.c,v 1.9 1999/04/15 09:41:09 bouyer Exp $ */ /* * Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved. @@ -39,7 +39,6 @@ #include <dev/ata/atareg.h> #include <dev/ata/atavar.h> #include <dev/ic/wdcreg.h> -#include <dev/ic/wdcvar.h> #define DEBUG_FUNCS 0x08 #define DEBUG_PROBE 0x10 diff --git a/sys/dev/ata/ata_wdc.c b/sys/dev/ata/ata_wdc.c index d5e37a65f2c..18f92a4b7d5 100644 --- a/sys/dev/ata/ata_wdc.c +++ b/sys/dev/ata/ata_wdc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ata_wdc.c,v 1.47 2014/09/14 14:17:24 jsg Exp $ */ +/* $OpenBSD: ata_wdc.c,v 1.48 2015/03/14 03:38:47 jsg Exp $ */ /* $NetBSD: ata_wdc.c,v 1.21 1999/08/09 09:43:11 bouyer Exp $ */ /* @@ -70,7 +70,6 @@ #include <machine/intr.h> #include <machine/bus.h> -#include <dev/ata/atareg.h> #include <dev/ata/atavar.h> #include <dev/ic/wdcreg.h> #include <dev/ic/wdcvar.h> diff --git a/sys/dev/ata/atascsi.c b/sys/dev/ata/atascsi.c index cd74e876511..4a9276958bf 100644 --- a/sys/dev/ata/atascsi.c +++ b/sys/dev/ata/atascsi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: atascsi.c,v 1.122 2015/01/27 03:17:36 dlg Exp $ */ +/* $OpenBSD: atascsi.c,v 1.123 2015/03/14 03:38:47 jsg Exp $ */ /* * Copyright (c) 2007 David Gwynne <dlg@openbsd.org> @@ -34,8 +34,6 @@ #include <dev/ata/atascsi.h> #include <dev/ata/pmreg.h> -#include <sys/ataio.h> - struct atascsi_port; struct atascsi { diff --git a/sys/dev/auconv.c b/sys/dev/auconv.c index c6a951db1cf..f2b3d0957b7 100644 --- a/sys/dev/auconv.c +++ b/sys/dev/auconv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auconv.c,v 1.9 2008/10/17 18:30:20 okan Exp $ */ +/* $OpenBSD: auconv.c,v 1.10 2015/03/14 03:38:46 jsg Exp $ */ /* $NetBSD: auconv.c,v 1.3 1999/11/01 18:12:19 augustss Exp $ */ /* @@ -29,7 +29,6 @@ */ #include <sys/types.h> -#include <sys/audioio.h> #include <dev/auconv.h> void diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c index fad7ef7fb2a..97ed93150b1 100644 --- a/sys/dev/cardbus/cardbus.c +++ b/sys/dev/cardbus/cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cardbus.c,v 1.49 2014/12/18 10:51:35 mpi Exp $ */ +/* $OpenBSD: cardbus.c,v 1.50 2015/03/14 03:38:47 jsg Exp $ */ /* $NetBSD: cardbus.c,v 1.24 2000/04/02 19:11:37 mycroft Exp $ */ /* @@ -33,7 +33,6 @@ #include <sys/device.h> #include <sys/malloc.h> #include <sys/kernel.h> -#include <sys/syslog.h> #include <machine/bus.h> diff --git a/sys/dev/cardbus/cardbus_map.c b/sys/dev/cardbus/cardbus_map.c index 248e28014e1..775dd444214 100644 --- a/sys/dev/cardbus/cardbus_map.c +++ b/sys/dev/cardbus/cardbus_map.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cardbus_map.c,v 1.14 2010/03/27 23:36:36 jsg Exp $ */ +/* $OpenBSD: cardbus_map.c,v 1.15 2015/03/14 03:38:47 jsg Exp $ */ /* $NetBSD: cardbus_map.c,v 1.10 2000/03/07 00:31:46 mycroft Exp $ */ /* @@ -31,7 +31,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/device.h> #include <machine/bus.h> diff --git a/sys/dev/cardbus/cardslot.c b/sys/dev/cardbus/cardslot.c index 24feebea55d..6dc7ac6918e 100644 --- a/sys/dev/cardbus/cardslot.c +++ b/sys/dev/cardbus/cardslot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cardslot.c,v 1.18 2015/01/27 03:17:36 dlg Exp $ */ +/* $OpenBSD: cardslot.c,v 1.19 2015/03/14 03:38:47 jsg Exp $ */ /* $NetBSD: cardslot.c,v 1.9 2000/03/22 09:35:06 haya Exp $ */ /* @@ -38,8 +38,6 @@ #include <sys/pool.h> #include <sys/task.h> -#include <machine/bus.h> - #include <dev/cardbus/cardslotvar.h> #include <dev/cardbus/cardbusvar.h> #include <dev/pcmcia/pcmciavar.h> diff --git a/sys/dev/cardbus/ehci_cardbus.c b/sys/dev/cardbus/ehci_cardbus.c index e044ec7864c..c0e08c13bc0 100644 --- a/sys/dev/cardbus/ehci_cardbus.c +++ b/sys/dev/cardbus/ehci_cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ehci_cardbus.c,v 1.20 2014/09/14 14:17:24 jsg Exp $ */ +/* $OpenBSD: ehci_cardbus.c,v 1.21 2015/03/14 03:38:47 jsg Exp $ */ /* $NetBSD: ehci_cardbus.c,v 1.6.6.3 2004/09/21 13:27:25 skrll Exp $ */ /* @@ -40,7 +40,6 @@ #include <machine/bus.h> #include <dev/cardbus/cardbusvar.h> -#include <dev/pci/pcidevs.h> #include <dev/usb/usb.h> #include <dev/usb/usbdi.h> diff --git a/sys/dev/cardbus/if_acx_cardbus.c b/sys/dev/cardbus/if_acx_cardbus.c index 3edd69f89c5..17c2c04a2f0 100644 --- a/sys/dev/cardbus/if_acx_cardbus.c +++ b/sys/dev/cardbus/if_acx_cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_acx_cardbus.c,v 1.20 2014/12/22 02:28:51 tedu Exp $ */ +/* $OpenBSD: if_acx_cardbus.c,v 1.21 2015/03/14 03:38:47 jsg Exp $ */ /* * Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org> @@ -49,7 +49,6 @@ #include <net80211/ieee80211_radiotap.h> #include <dev/ic/acxvar.h> -#include <dev/ic/acxreg.h> #include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> diff --git a/sys/dev/cardbus/if_atw_cardbus.c b/sys/dev/cardbus/if_atw_cardbus.c index 5a6414894b8..e9664d41c4c 100644 --- a/sys/dev/cardbus/if_atw_cardbus.c +++ b/sys/dev/cardbus/if_atw_cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_atw_cardbus.c,v 1.22 2014/12/22 02:28:51 tedu Exp $ */ +/* $OpenBSD: if_atw_cardbus.c,v 1.23 2015/03/14 03:38:47 jsg Exp $ */ /* $NetBSD: if_atw_cardbus.c,v 1.9 2004/07/23 07:07:55 dyoung Exp $ */ /*- @@ -67,7 +67,6 @@ #include <machine/intr.h> #include <dev/ic/atwreg.h> -#include <dev/ic/rf3000reg.h> #include <dev/ic/si4136reg.h> #include <dev/ic/atwvar.h> diff --git a/sys/dev/cardbus/if_dc_cardbus.c b/sys/dev/cardbus/if_dc_cardbus.c index 6b5e15fbf48..bff7195bc0a 100644 --- a/sys/dev/cardbus/if_dc_cardbus.c +++ b/sys/dev/cardbus/if_dc_cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_dc_cardbus.c,v 1.36 2014/09/14 14:17:24 jsg Exp $ */ +/* $OpenBSD: if_dc_cardbus.c,v 1.37 2015/03/14 03:38:47 jsg Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -52,7 +52,6 @@ #include <netinet/in.h> #include <netinet/if_ether.h> -#include <dev/mii/mii.h> #include <dev/mii/miivar.h> #include <machine/bus.h> diff --git a/sys/dev/cardbus/if_pgt_cardbus.c b/sys/dev/cardbus/if_pgt_cardbus.c index 84e36a627ad..90ddaa4044f 100644 --- a/sys/dev/cardbus/if_pgt_cardbus.c +++ b/sys/dev/cardbus/if_pgt_cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pgt_cardbus.c,v 1.15 2013/12/06 21:03:02 deraadt Exp $ */ +/* $OpenBSD: if_pgt_cardbus.c,v 1.16 2015/03/14 03:38:47 jsg Exp $ */ /* * Copyright (c) 2006 Marcus Glocker <mglocker@openbsd.org> @@ -33,7 +33,6 @@ #include <sys/device.h> #include <machine/bus.h> -#include <machine/intr.h> #include <net/if.h> #include <net/if_dl.h> diff --git a/sys/dev/cardbus/if_re_cardbus.c b/sys/dev/cardbus/if_re_cardbus.c index 24164c27b35..49699baa2c2 100644 --- a/sys/dev/cardbus/if_re_cardbus.c +++ b/sys/dev/cardbus/if_re_cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_re_cardbus.c,v 1.26 2014/11/24 02:03:37 brad Exp $ */ +/* $OpenBSD: if_re_cardbus.c,v 1.27 2015/03/14 03:38:47 jsg Exp $ */ /* * Copyright (c) 2005 Peter Valchev <pvalchev@openbsd.org> @@ -38,7 +38,6 @@ #include <netinet/in.h> #include <netinet/if_ether.h> -#include <dev/mii/mii.h> #include <dev/mii/miivar.h> #include <dev/pci/pcidevs.h> diff --git a/sys/dev/cardbus/if_rtw_cardbus.c b/sys/dev/cardbus/if_rtw_cardbus.c index 3a215cbebc6..a65c84f0f1f 100644 --- a/sys/dev/cardbus/if_rtw_cardbus.c +++ b/sys/dev/cardbus/if_rtw_cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_rtw_cardbus.c,v 1.24 2014/12/22 02:28:51 tedu Exp $ */ +/* $OpenBSD: if_rtw_cardbus.c,v 1.25 2015/03/14 03:38:47 jsg Exp $ */ /* $NetBSD: if_rtw_cardbus.c,v 1.4 2004/12/20 21:05:34 dyoung Exp $ */ /*- @@ -94,7 +94,6 @@ #endif #include <machine/bus.h> -#include <machine/intr.h> #include <dev/ic/rtwreg.h> #include <dev/ic/rtwvar.h> diff --git a/sys/dev/cardbus/if_xl_cardbus.c b/sys/dev/cardbus/if_xl_cardbus.c index 87d6847a21a..9833ed84d94 100644 --- a/sys/dev/cardbus/if_xl_cardbus.c +++ b/sys/dev/cardbus/if_xl_cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_xl_cardbus.c,v 1.30 2014/09/14 14:17:24 jsg Exp $ */ +/* $OpenBSD: if_xl_cardbus.c,v 1.31 2015/03/14 03:38:47 jsg Exp $ */ /* $NetBSD: if_xl_cardbus.c,v 1.13 2000/03/07 00:32:52 mycroft Exp $ */ /* @@ -57,7 +57,6 @@ #include <dev/cardbus/cardbusvar.h> #include <dev/pci/pcidevs.h> -#include <dev/mii/mii.h> #include <dev/mii/miivar.h> #include <dev/ic/xlreg.h> diff --git a/sys/dev/cardbus/ohci_cardbus.c b/sys/dev/cardbus/ohci_cardbus.c index fd5fafd68b8..af76290abb4 100644 --- a/sys/dev/cardbus/ohci_cardbus.c +++ b/sys/dev/cardbus/ohci_cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ohci_cardbus.c,v 1.20 2014/09/14 14:17:24 jsg Exp $ */ +/* $OpenBSD: ohci_cardbus.c,v 1.21 2015/03/14 03:38:47 jsg Exp $ */ /* $NetBSD: ohci_cardbus.c,v 1.19 2004/08/02 19:14:28 mycroft Exp $ */ /* @@ -47,7 +47,6 @@ #include <machine/bus.h> #include <dev/cardbus/cardbusvar.h> -#include <dev/pci/pcidevs.h> #include <dev/usb/usb.h> #include <dev/usb/usbdi.h> diff --git a/sys/dev/cardbus/uhci_cardbus.c b/sys/dev/cardbus/uhci_cardbus.c index 5004ddf73ef..f8aecdb9dc8 100644 --- a/sys/dev/cardbus/uhci_cardbus.c +++ b/sys/dev/cardbus/uhci_cardbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uhci_cardbus.c,v 1.14 2014/09/14 14:17:24 jsg Exp $ */ +/* $OpenBSD: uhci_cardbus.c,v 1.15 2015/03/14 03:38:47 jsg Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -38,7 +38,6 @@ #include <machine/bus.h> #include <dev/cardbus/cardbusvar.h> -#include <dev/pci/pcidevs.h> #include <dev/usb/usb.h> #include <dev/usb/usbdi.h> diff --git a/sys/dev/cninit.c b/sys/dev/cninit.c index e675680c0a6..33e4f7e99b1 100644 --- a/sys/dev/cninit.c +++ b/sys/dev/cninit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cninit.c,v 1.13 2014/09/14 14:17:24 jsg Exp $ */ +/* $OpenBSD: cninit.c,v 1.14 2015/03/14 03:38:46 jsg Exp $ */ /* $NetBSD: cninit.c,v 1.2 1995/04/11 22:08:10 pk Exp $ */ /* @@ -41,7 +41,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/buf.h> #include <sys/ioctl.h> #include <sys/tty.h> #include <sys/file.h> diff --git a/sys/dev/cons.c b/sys/dev/cons.c index 5ba0be901ec..9ed76068bbe 100644 --- a/sys/dev/cons.c +++ b/sys/dev/cons.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cons.c,v 1.24 2014/09/14 14:17:24 jsg Exp $ */ +/* $OpenBSD: cons.c,v 1.25 2015/03/14 03:38:46 jsg Exp $ */ /* $NetBSD: cons.c,v 1.30 1996/04/08 19:57:30 jonathan Exp $ */ /* @@ -41,7 +41,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/buf.h> #include <sys/ioctl.h> #include <sys/tty.h> #include <sys/file.h> diff --git a/sys/dev/diskmap.c b/sys/dev/diskmap.c index 99487560666..2b54b5c4c21 100644 --- a/sys/dev/diskmap.c +++ b/sys/dev/diskmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diskmap.c,v 1.9 2014/12/16 18:30:03 tedu Exp $ */ +/* $OpenBSD: diskmap.c,v 1.10 2015/03/14 03:38:46 jsg Exp $ */ /* * Copyright (c) 2009, 2010 Joel Sing <jsing@openbsd.org> @@ -25,7 +25,6 @@ #include <sys/systm.h> #include <sys/device.h> #include <sys/errno.h> -#include <sys/buf.h> #include <sys/conf.h> #include <sys/dkio.h> #include <sys/disk.h> diff --git a/sys/dev/hotplug.c b/sys/dev/hotplug.c index 9d6b32fa582..b0813e8c5d0 100644 --- a/sys/dev/hotplug.c +++ b/sys/dev/hotplug.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hotplug.c,v 1.14 2015/02/10 21:58:16 miod Exp $ */ +/* $OpenBSD: hotplug.c,v 1.15 2015/03/14 03:38:46 jsg Exp $ */ /* * Copyright (c) 2004 Alexander Yurchenko <grange@openbsd.org> * @@ -21,7 +21,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/conf.h> #include <sys/device.h> #include <sys/fcntl.h> #include <sys/hotplug.h> diff --git a/sys/dev/i2c/i2c.c b/sys/dev/i2c/i2c.c index 3db9c350972..3d3fcf2130a 100644 --- a/sys/dev/i2c/i2c.c +++ b/sys/dev/i2c/i2c.c @@ -1,4 +1,4 @@ -/* $OpenBSD: i2c.c,v 1.15 2007/10/09 16:57:47 deraadt Exp $ */ +/* $OpenBSD: i2c.c,v 1.16 2015/03/14 03:38:47 jsg Exp $ */ /* $NetBSD: i2c.c,v 1.1 2003/09/30 00:35:31 thorpej Exp $ */ /* @@ -40,7 +40,6 @@ #include <sys/systm.h> #include <sys/device.h> #include <sys/event.h> -#include <sys/conf.h> #define _I2C_PRIVATE #include <dev/i2c/i2cvar.h> diff --git a/sys/dev/i2c/i2c_exec.c b/sys/dev/i2c/i2c_exec.c index 0da93ef846a..1bb5c8c7a2f 100644 --- a/sys/dev/i2c/i2c_exec.c +++ b/sys/dev/i2c/i2c_exec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: i2c_exec.c,v 1.2 2008/04/17 16:48:40 deraadt Exp $ */ +/* $OpenBSD: i2c_exec.c,v 1.3 2015/03/14 03:38:47 jsg Exp $ */ /* $NetBSD: i2c_exec.c,v 1.3 2003/10/29 00:34:58 mycroft Exp $ */ /* @@ -40,7 +40,6 @@ #include <sys/systm.h> #include <sys/device.h> #include <sys/event.h> -#include <sys/conf.h> #define _I2C_PRIVATE #include <dev/i2c/i2cvar.h> diff --git a/sys/dev/i2c/lm75.c b/sys/dev/i2c/lm75.c index 3145e1fa11e..844f1ef346a 100644 --- a/sys/dev/i2c/lm75.c +++ b/sys/dev/i2c/lm75.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lm75.c,v 1.18 2008/04/17 19:01:48 deraadt Exp $ */ +/* $OpenBSD: lm75.c,v 1.19 2015/03/14 03:38:47 jsg Exp $ */ /* $NetBSD: lm75.c,v 1.1 2003/09/30 00:35:31 thorpej Exp $ */ /* * Copyright (c) 2006 Theo de Raadt <deraadt@openbsd.org> @@ -24,7 +24,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> -#include <sys/kernel.h> #include <sys/sensors.h> #include <dev/i2c/i2cvar.h> diff --git a/sys/dev/i2c/lm78_i2c.c b/sys/dev/i2c/lm78_i2c.c index b8074b4d1cc..5a2504991c8 100644 --- a/sys/dev/i2c/lm78_i2c.c +++ b/sys/dev/i2c/lm78_i2c.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lm78_i2c.c,v 1.3 2011/07/26 18:43:36 deraadt Exp $ */ +/* $OpenBSD: lm78_i2c.c,v 1.4 2015/03/14 03:38:47 jsg Exp $ */ /* * Copyright (c) 2005 Mark Kettenis @@ -21,8 +21,6 @@ #include <sys/device.h> #include <sys/sensors.h> -#include <machine/bus.h> - #include <dev/i2c/i2cvar.h> #include <dev/ic/lm78var.h> diff --git a/sys/dev/ic/ac97.c b/sys/dev/ic/ac97.c index 27d4ece9585..505720e0fc0 100644 --- a/sys/dev/ic/ac97.c +++ b/sys/dev/ic/ac97.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ac97.c,v 1.78 2014/07/12 18:48:17 tedu Exp $ */ +/* $OpenBSD: ac97.c,v 1.79 2015/03/14 03:38:47 jsg Exp $ */ /* * Copyright (c) 1999, 2000 Constantine Sapuntzakis @@ -64,7 +64,6 @@ #include <sys/systm.h> #include <sys/kernel.h> #include <sys/malloc.h> -#include <sys/device.h> #include <sys/audioio.h> #include <dev/audio_if.h> diff --git a/sys/dev/ic/acx.c b/sys/dev/ic/acx.c index 6bd03202bab..c2c8ea8b203 100644 --- a/sys/dev/ic/acx.c +++ b/sys/dev/ic/acx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acx.c,v 1.110 2015/02/10 23:25:46 mpi Exp $ */ +/* $OpenBSD: acx.c,v 1.111 2015/03/14 03:38:47 jsg Exp $ */ /* * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org> @@ -104,7 +104,6 @@ #include <machine/intr.h> #include <net/if.h> -#include <net/if_arp.h> #include <net/if_dl.h> #include <net/if_media.h> #include <net/if_types.h> diff --git a/sys/dev/ic/adw.c b/sys/dev/ic/adw.c index f44caa07d2f..491a1bd9159 100644 --- a/sys/dev/ic/adw.c +++ b/sys/dev/ic/adw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: adw.c,v 1.51 2014/09/14 14:17:24 jsg Exp $ */ +/* $OpenBSD: adw.c,v 1.52 2015/03/14 03:38:47 jsg Exp $ */ /* $NetBSD: adw.c,v 1.23 2000/05/27 18:24:50 dante Exp $ */ /* @@ -36,7 +36,6 @@ #include <sys/systm.h> #include <sys/kernel.h> #include <sys/errno.h> -#include <sys/ioctl.h> #include <sys/device.h> #include <sys/malloc.h> #include <sys/buf.h> diff --git a/sys/dev/ic/aic79xx.c b/sys/dev/ic/aic79xx.c index ee2f1301b59..76d31f55909 100644 --- a/sys/dev/ic/aic79xx.c +++ b/sys/dev/ic/aic79xx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aic79xx.c,v 1.55 2014/12/13 21:05:33 doug Exp $ */ +/* $OpenBSD: aic79xx.c,v 1.56 2015/03/14 03:38:47 jsg Exp $ */ /* * Copyright (c) 2004 Milos Urbanek, Kenneth R. Westerback & Marco Peereboom @@ -75,7 +75,6 @@ #include <dev/ic/aic79xx_inline.h> #include <dev/ic/aic79xx.h> -#include <dev/microcode/aic7xxx/aicasm.h> #include <dev/microcode/aic7xxx/aicasm_insformat.h> /******************************** Globals *************************************/ diff --git a/sys/dev/ic/aic7xxx_seeprom.c b/sys/dev/ic/aic7xxx_seeprom.c index 00622bc6fa5..e3c48684f29 100644 --- a/sys/dev/ic/aic7xxx_seeprom.c +++ b/sys/dev/ic/aic7xxx_seeprom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aic7xxx_seeprom.c,v 1.5 2014/07/12 18:48:17 tedu Exp $ */ +/* $OpenBSD: aic7xxx_seeprom.c,v 1.6 2015/03/14 03:38:47 jsg Exp $ */ /* $NetBSD: aic7xxx_seeprom.c,v 1.8 2003/05/02 19:12:19 dyoung Exp $ */ /* @@ -47,7 +47,7 @@ * from the FreeBSD source file aic7xxx_pci.c by Frank van der Linden * <fvdl@netbsd.org> * - * $Id: aic7xxx_seeprom.c,v 1.5 2014/07/12 18:48:17 tedu Exp $ + * $Id: aic7xxx_seeprom.c,v 1.6 2015/03/14 03:38:47 jsg Exp $ * * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx_pci.c,v 1.22 2003/01/20 20:44:55 gibbs Exp $ */ @@ -60,7 +60,6 @@ #include <sys/device.h> #include <sys/reboot.h> /* for AB_* needed by bootverbose */ -#include <machine/bus.h> #include <machine/intr.h> #include <scsi/scsi_all.h> diff --git a/sys/dev/ic/ar5008.c b/sys/dev/ic/ar5008.c index b571b33e49a..fed671d6509 100644 --- a/sys/dev/ic/ar5008.c +++ b/sys/dev/ic/ar5008.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ar5008.c,v 1.28 2015/02/10 23:25:46 mpi Exp $ */ +/* $OpenBSD: ar5008.c,v 1.29 2015/03/14 03:38:47 jsg Exp $ */ /*- * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr> @@ -39,7 +39,6 @@ #include <sys/endian.h> #include <machine/bus.h> -#include <machine/intr.h> #if NBPFILTER > 0 #include <net/bpf.h> diff --git a/sys/dev/ic/ar9003.c b/sys/dev/ic/ar9003.c index 700bebaad02..ab6a36b2758 100644 --- a/sys/dev/ic/ar9003.c +++ b/sys/dev/ic/ar9003.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ar9003.c,v 1.32 2015/02/10 23:25:46 mpi Exp $ */ +/* $OpenBSD: ar9003.c,v 1.33 2015/03/14 03:38:47 jsg Exp $ */ /*- * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr> @@ -39,7 +39,6 @@ #include <sys/endian.h> #include <machine/bus.h> -#include <machine/intr.h> #if NBPFILTER > 0 #include <net/bpf.h> diff --git a/sys/dev/ic/ath.c b/sys/dev/ic/ath.c index a7727918f8d..0fbac5b1a1f 100644 --- a/sys/dev/ic/ath.c +++ b/sys/dev/ic/ath.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ath.c,v 1.104 2015/02/10 23:25:46 mpi Exp $ */ +/* $OpenBSD: ath.c,v 1.105 2015/03/14 03:38:47 jsg Exp $ */ /* $NetBSD: ath.c,v 1.37 2004/08/18 21:59:39 dyoung Exp $ */ /*- @@ -62,7 +62,6 @@ #include <net/if.h> #include <net/if_dl.h> #include <net/if_media.h> -#include <net/if_arp.h> #if NBPFILTER > 0 #include <net/bpf.h> #endif diff --git a/sys/dev/ic/athn.c b/sys/dev/ic/athn.c index f72d0c48809..dede2eb9653 100644 --- a/sys/dev/ic/athn.c +++ b/sys/dev/ic/athn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: athn.c,v 1.85 2014/12/22 02:28:51 tedu Exp $ */ +/* $OpenBSD: athn.c,v 1.86 2015/03/14 03:38:47 jsg Exp $ */ /*- * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr> @@ -45,7 +45,6 @@ #include <net/bpf.h> #endif #include <net/if.h> -#include <net/if_arp.h> #include <net/if_dl.h> #include <net/if_media.h> #include <net/if_types.h> diff --git a/sys/dev/ic/atw.c b/sys/dev/ic/atw.c index 1e4dea9d594..5f3053759c1 100644 --- a/sys/dev/ic/atw.c +++ b/sys/dev/ic/atw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: atw.c,v 1.86 2015/02/10 23:25:46 mpi Exp $ */ +/* $OpenBSD: atw.c,v 1.87 2015/03/14 03:38:47 jsg Exp $ */ /* $NetBSD: atw.c,v 1.69 2004/07/23 07:07:55 dyoung Exp $ */ /*- @@ -49,7 +49,6 @@ #include <sys/endian.h> #include <net/if.h> -#include <net/if_dl.h> #include <net/if_media.h> #if NBPFILTER > 0 diff --git a/sys/dev/ic/ax88190.c b/sys/dev/ic/ax88190.c index 35dc7ffe416..c8d11a2ba8f 100644 --- a/sys/dev/ic/ax88190.c +++ b/sys/dev/ic/ax88190.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ax88190.c,v 1.5 2014/07/22 13:12:11 mpi Exp $ */ +/* $OpenBSD: ax88190.c,v 1.6 2015/03/14 03:38:47 jsg Exp $ */ /* $NetBSD$ */ /*- @@ -56,7 +56,6 @@ #include <dev/ic/ne2000var.h> #include <dev/ic/ax88190reg.h> -#include <dev/ic/ax88190var.h> int ax88190_mii_readreg(struct device *, int, int); void ax88190_mii_writereg(struct device *, int, int, int); diff --git a/sys/dev/ic/ciss.c b/sys/dev/ic/ciss.c index 33cc0bd4ec5..ac44ea60c2a 100644 --- a/sys/dev/ic/ciss.c +++ b/sys/dev/ic/ciss.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ciss.c,v 1.71 2014/09/14 14:17:24 jsg Exp $ */ +/* $OpenBSD: ciss.c,v 1.72 2015/03/14 03:38:47 jsg Exp $ */ /* * Copyright (c) 2005,2006 Michael Shalayeff @@ -32,7 +32,6 @@ #include <machine/bus.h> #include <scsi/scsi_all.h> -#include <scsi/scsi_disk.h> #include <scsi/scsiconf.h> #include <dev/ic/cissreg.h> diff --git a/sys/dev/ic/dc.c b/sys/dev/ic/dc.c index e61599065d4..4641274032e 100644 --- a/sys/dev/ic/dc.c +++ b/sys/dev/ic/dc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dc.c,v 1.138 2015/03/13 15:57:43 jasper Exp $ */ +/* $OpenBSD: dc.c,v 1.139 2015/03/14 03:38:47 jsg Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -104,7 +104,6 @@ #include <sys/timeout.h> #include <net/if.h> -#include <net/if_dl.h> #include <net/if_types.h> #include <netinet/in.h> diff --git a/sys/dev/ic/dl10019.c b/sys/dev/ic/dl10019.c index ff10975a829..7aa35598a06 100644 --- a/sys/dev/ic/dl10019.c +++ b/sys/dev/ic/dl10019.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dl10019.c,v 1.6 2014/07/22 13:12:11 mpi Exp $ */ +/* $OpenBSD: dl10019.c,v 1.7 2015/03/14 03:38:47 jsg Exp $ */ /* $NetBSD$ */ /*- @@ -58,7 +58,6 @@ #include <dev/ic/ne2000var.h> #include <dev/ic/dl10019reg.h> -#include <dev/ic/dl10019var.h> int dl10019_mii_readreg(struct device *, int, int); void dl10019_mii_writereg(struct device *, int, int, int); diff --git a/sys/dev/ic/dp8390.c b/sys/dev/ic/dp8390.c index c620f2d1f47..11c80189fdb 100644 --- a/sys/dev/ic/dp8390.c +++ b/sys/dev/ic/dp8390.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dp8390.c,v 1.48 2014/12/22 02:28:51 tedu Exp $ */ +/* $OpenBSD: dp8390.c,v 1.49 2015/03/14 03:38:47 jsg Exp $ */ /* $NetBSD: dp8390.c,v 1.13 1998/07/05 06:49:11 jonathan Exp $ */ /* @@ -26,7 +26,6 @@ #include <sys/syslog.h> #include <net/if.h> -#include <net/if_dl.h> #include <net/if_types.h> #include <net/if_media.h> diff --git a/sys/dev/ic/elink3.c b/sys/dev/ic/elink3.c index 5dbc6bf35db..0f959554dee 100644 --- a/sys/dev/ic/elink3.c +++ b/sys/dev/ic/elink3.c @@ -1,4 +1,4 @@ -/* $OpenBSD: elink3.c,v 1.82 2014/12/29 02:33:13 brad Exp $ */ +/* $OpenBSD: elink3.c,v 1.83 2015/03/14 03:38:47 jsg Exp $ */ /* $NetBSD: elink3.c,v 1.32 1997/05/14 00:22:00 thorpej Exp $ */ /* @@ -46,7 +46,6 @@ #include <sys/device.h> #include <net/if.h> -#include <net/if_dl.h> #include <net/if_types.h> #include <net/netisr.h> #include <net/if_media.h> diff --git a/sys/dev/ic/fxp.c b/sys/dev/ic/fxp.c index 681773a1323..6b28de0c4b2 100644 --- a/sys/dev/ic/fxp.c +++ b/sys/dev/ic/fxp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fxp.c,v 1.119 2015/02/12 09:08:00 mpi Exp $ */ +/* $OpenBSD: fxp.c,v 1.120 2015/03/14 03:38:47 jsg Exp $ */ /* $NetBSD: if_fxp.c,v 1.2 1997/06/05 02:01:55 thorpej Exp $ */ /* @@ -49,7 +49,6 @@ #include <sys/timeout.h> #include <net/if.h> -#include <net/if_dl.h> #include <net/if_media.h> #include <net/if_types.h> diff --git a/sys/dev/ic/gem.c b/sys/dev/ic/gem.c index 1f58704f300..bdfad8e66ce 100644 --- a/sys/dev/ic/gem.c +++ b/sys/dev/ic/gem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gem.c,v 1.110 2015/02/09 03:09:57 dlg Exp $ */ +/* $OpenBSD: gem.c,v 1.111 2015/03/14 03:38:47 jsg Exp $ */ /* $NetBSD: gem.c,v 1.1 2001/09/16 00:11:43 eeh Exp $ */ /* @@ -65,7 +65,6 @@ #include <dev/mii/mii.h> #include <dev/mii/miivar.h> -#include <dev/mii/mii_bitbang.h> #include <dev/ic/gemreg.h> #include <dev/ic/gemvar.h> diff --git a/sys/dev/ic/hme.c b/sys/dev/ic/hme.c index 9f7e5f57463..0882030162a 100644 --- a/sys/dev/ic/hme.c +++ b/sys/dev/ic/hme.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hme.c,v 1.70 2014/12/22 02:28:51 tedu Exp $ */ +/* $OpenBSD: hme.c,v 1.71 2015/03/14 03:38:47 jsg Exp $ */ /* $NetBSD: hme.c,v 1.21 2001/07/07 15:59:37 thorpej Exp $ */ /*- @@ -51,7 +51,6 @@ #include <sys/errno.h> #include <net/if.h> -#include <net/if_dl.h> #include <net/if_media.h> #include <netinet/in.h> diff --git a/sys/dev/ic/if_wi.c b/sys/dev/ic/if_wi.c index 2ba3c170ae8..0692d53f938 100644 --- a/sys/dev/ic/if_wi.c +++ b/sys/dev/ic/if_wi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wi.c,v 1.159 2014/12/22 02:28:51 tedu Exp $ */ +/* $OpenBSD: if_wi.c,v 1.160 2015/03/14 03:38:47 jsg Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -76,7 +76,6 @@ #include <net/if.h> #include <net/if_dl.h> #include <net/if_media.h> -#include <net/if_types.h> #include <netinet/in.h> #include <netinet/if_ether.h> diff --git a/sys/dev/ic/iha.c b/sys/dev/ic/iha.c index b01a1a39601..9f40667c64a 100644 --- a/sys/dev/ic/iha.c +++ b/sys/dev/ic/iha.c @@ -1,4 +1,4 @@ -/* $OpenBSD: iha.c,v 1.42 2012/02/04 21:44:54 krw Exp $ */ +/* $OpenBSD: iha.c,v 1.43 2015/03/14 03:38:47 jsg Exp $ */ /*------------------------------------------------------------------------- * * Device driver for the INI-9XXXU/UW or INIC-940/950 PCI SCSI Controller. @@ -34,7 +34,6 @@ */ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/buf.h> #include <sys/device.h> diff --git a/sys/dev/ic/lm78.c b/sys/dev/ic/lm78.c index 142a136aa4a..bc0664f0418 100644 --- a/sys/dev/ic/lm78.c +++ b/sys/dev/ic/lm78.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lm78.c,v 1.23 2011/12/06 16:06:07 mpf Exp $ */ +/* $OpenBSD: lm78.c,v 1.24 2015/03/14 03:38:47 jsg Exp $ */ /* * Copyright (c) 2005, 2006 Mark Kettenis @@ -22,7 +22,6 @@ #include <sys/kernel.h> #include <sys/queue.h> #include <sys/sensors.h> -#include <machine/bus.h> #include <dev/ic/lm78var.h> #include <dev/isa/wbsioreg.h> diff --git a/sys/dev/ic/mfi.c b/sys/dev/ic/mfi.c index b2c93ec526b..78e5133bdc4 100644 --- a/sys/dev/ic/mfi.c +++ b/sys/dev/ic/mfi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mfi.c,v 1.161 2015/03/08 04:33:44 dlg Exp $ */ +/* $OpenBSD: mfi.c,v 1.162 2015/03/14 03:38:47 jsg Exp $ */ /* * Copyright (c) 2006 Marco Peereboom <marco@peereboom.us> * @@ -21,7 +21,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/buf.h> -#include <sys/ioctl.h> #include <sys/device.h> #include <sys/kernel.h> #include <sys/malloc.h> diff --git a/sys/dev/ic/mpi.c b/sys/dev/ic/mpi.c index 9a65462e31f..0350ba29cca 100644 --- a/sys/dev/ic/mpi.c +++ b/sys/dev/ic/mpi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpi.c,v 1.199 2015/01/27 03:17:36 dlg Exp $ */ +/* $OpenBSD: mpi.c,v 1.200 2015/03/14 03:38:47 jsg Exp $ */ /* * Copyright (c) 2005, 2006, 2009 David Gwynne <dlg@openbsd.org> @@ -23,7 +23,6 @@ #include <sys/systm.h> #include <sys/buf.h> #include <sys/device.h> -#include <sys/ioctl.h> #include <sys/malloc.h> #include <sys/kernel.h> #include <sys/mutex.h> diff --git a/sys/dev/ic/ncr53c9x.c b/sys/dev/ic/ncr53c9x.c index 712cf557d9e..336b70e3a40 100644 --- a/sys/dev/ic/ncr53c9x.c +++ b/sys/dev/ic/ncr53c9x.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ncr53c9x.c,v 1.59 2014/09/14 14:17:24 jsg Exp $ */ +/* $OpenBSD: ncr53c9x.c,v 1.60 2015/03/14 03:38:47 jsg Exp $ */ /* $NetBSD: ncr53c9x.c,v 1.56 2000/11/30 14:41:46 thorpej Exp $ */ /* @@ -72,7 +72,6 @@ #include <sys/errno.h> #include <sys/ioctl.h> #include <sys/device.h> -#include <sys/buf.h> #include <sys/malloc.h> #include <sys/queue.h> #include <sys/pool.h> diff --git a/sys/dev/ic/pckbc.c b/sys/dev/ic/pckbc.c index 471d5fbcbc1..5b927bd82e9 100644 --- a/sys/dev/ic/pckbc.c +++ b/sys/dev/ic/pckbc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pckbc.c,v 1.44 2015/03/12 20:24:16 deraadt Exp $ */ +/* $OpenBSD: pckbc.c,v 1.45 2015/03/14 03:38:47 jsg Exp $ */ /* $NetBSD: pckbc.c,v 1.5 2000/06/09 04:58:35 soda Exp $ */ /* @@ -34,7 +34,6 @@ #include <sys/malloc.h> #include <sys/errno.h> #include <sys/queue.h> -#include <sys/lock.h> #include <machine/bus.h> #include <machine/cpu.h> diff --git a/sys/dev/ic/qla.c b/sys/dev/ic/qla.c index cbafd2a8e47..8c003eaaef5 100644 --- a/sys/dev/ic/qla.c +++ b/sys/dev/ic/qla.c @@ -1,4 +1,4 @@ -/* $OpenBSD: qla.c,v 1.49 2015/02/09 07:43:08 jmatthew Exp $ */ +/* $OpenBSD: qla.c,v 1.50 2015/03/14 03:38:47 jsg Exp $ */ /* * Copyright (c) 2011 David Gwynne <dlg@openbsd.org> @@ -19,7 +19,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/buf.h> #include <sys/device.h> #include <sys/ioctl.h> #include <sys/malloc.h> diff --git a/sys/dev/ic/qlw.c b/sys/dev/ic/qlw.c index 1b900fa4a47..22f039fb128 100644 --- a/sys/dev/ic/qlw.c +++ b/sys/dev/ic/qlw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: qlw.c,v 1.27 2015/01/27 03:17:36 dlg Exp $ */ +/* $OpenBSD: qlw.c,v 1.28 2015/03/14 03:38:47 jsg Exp $ */ /* * Copyright (c) 2011 David Gwynne <dlg@openbsd.org> @@ -20,7 +20,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/buf.h> #include <sys/device.h> #include <sys/ioctl.h> #include <sys/malloc.h> diff --git a/sys/dev/ic/rt2560.c b/sys/dev/ic/rt2560.c index 206a0ec95b3..61e0601c03e 100644 --- a/sys/dev/ic/rt2560.c +++ b/sys/dev/ic/rt2560.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rt2560.c,v 1.70 2015/02/10 23:25:46 mpi Exp $ */ +/* $OpenBSD: rt2560.c,v 1.71 2015/03/14 03:38:47 jsg Exp $ */ /*- * Copyright (c) 2005, 2006 @@ -43,7 +43,6 @@ #include <net/bpf.h> #endif #include <net/if.h> -#include <net/if_arp.h> #include <net/if_dl.h> #include <net/if_media.h> #include <net/if_types.h> diff --git a/sys/dev/ic/rt2661.c b/sys/dev/ic/rt2661.c index dd17032c366..97a7d36f893 100644 --- a/sys/dev/ic/rt2661.c +++ b/sys/dev/ic/rt2661.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rt2661.c,v 1.79 2015/02/10 23:25:46 mpi Exp $ */ +/* $OpenBSD: rt2661.c,v 1.80 2015/03/14 03:38:47 jsg Exp $ */ /*- * Copyright (c) 2006 @@ -44,7 +44,6 @@ #include <net/bpf.h> #endif #include <net/if.h> -#include <net/if_arp.h> #include <net/if_dl.h> #include <net/if_media.h> #include <net/if_types.h> diff --git a/sys/dev/ic/rt2860.c b/sys/dev/ic/rt2860.c index caf7a437639..98f472597fb 100644 --- a/sys/dev/ic/rt2860.c +++ b/sys/dev/ic/rt2860.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rt2860.c,v 1.79 2015/02/10 23:25:46 mpi Exp $ */ +/* $OpenBSD: rt2860.c,v 1.80 2015/03/14 03:38:47 jsg Exp $ */ /*- * Copyright (c) 2007-2010 Damien Bergamini <damien.bergamini@free.fr> @@ -43,7 +43,6 @@ #include <net/bpf.h> #endif #include <net/if.h> -#include <net/if_arp.h> #include <net/if_dl.h> #include <net/if_media.h> #include <net/if_types.h> diff --git a/sys/dev/ic/rtl80x9.c b/sys/dev/ic/rtl80x9.c index 807676c6c12..9cded86e920 100644 --- a/sys/dev/ic/rtl80x9.c +++ b/sys/dev/ic/rtl80x9.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtl80x9.c,v 1.9 2014/12/22 02:28:51 tedu Exp $ */ +/* $OpenBSD: rtl80x9.c,v 1.10 2015/03/14 03:38:47 jsg Exp $ */ /* $NetBSD: rtl80x9.c,v 1.1 1998/10/31 00:44:33 thorpej Exp $ */ /*- @@ -51,7 +51,6 @@ #include <dev/ic/dp8390reg.h> #include <dev/ic/dp8390var.h> -#include <dev/ic/ne2000reg.h> #include <dev/ic/ne2000var.h> #include <dev/ic/rtl80x9reg.h> diff --git a/sys/dev/ic/rtl81x9.c b/sys/dev/ic/rtl81x9.c index 16803467219..99e559f862c 100644 --- a/sys/dev/ic/rtl81x9.c +++ b/sys/dev/ic/rtl81x9.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtl81x9.c,v 1.87 2015/01/08 00:49:18 brad Exp $ */ +/* $OpenBSD: rtl81x9.c,v 1.88 2015/03/14 03:38:47 jsg Exp $ */ /* * Copyright (c) 1997, 1998 @@ -96,7 +96,6 @@ #include <sys/timeout.h> #include <net/if.h> -#include <net/if_dl.h> #include <net/if_types.h> #include <netinet/in.h> diff --git a/sys/dev/ic/rtsx.c b/sys/dev/ic/rtsx.c index ece1a8950ce..06fcfd5401e 100644 --- a/sys/dev/ic/rtsx.c +++ b/sys/dev/ic/rtsx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtsx.c,v 1.10 2014/08/19 17:55:03 phessler Exp $ */ +/* $OpenBSD: rtsx.c,v 1.11 2015/03/14 03:38:47 jsg Exp $ */ /* * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org> @@ -24,7 +24,6 @@ #include <sys/param.h> #include <sys/device.h> #include <sys/kernel.h> -#include <sys/kthread.h> #include <sys/systm.h> #include <dev/ic/rtsxreg.h> diff --git a/sys/dev/ic/sili.c b/sys/dev/ic/sili.c index 84fdd83a2f1..a7e756bfed4 100644 --- a/sys/dev/ic/sili.c +++ b/sys/dev/ic/sili.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sili.c,v 1.55 2014/11/18 02:37:30 tedu Exp $ */ +/* $OpenBSD: sili.c,v 1.56 2015/03/14 03:38:47 jsg Exp $ */ /* * Copyright (c) 2007 David Gwynne <dlg@openbsd.org> @@ -20,7 +20,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/buf.h> #include <sys/device.h> #include <sys/timeout.h> #include <sys/malloc.h> diff --git a/sys/dev/ic/siop.c b/sys/dev/ic/siop.c index 9dade4b89cb..bf8af6351f3 100644 --- a/sys/dev/ic/siop.c +++ b/sys/dev/ic/siop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: siop.c,v 1.69 2014/12/19 22:44:58 guenther Exp $ */ +/* $OpenBSD: siop.c,v 1.70 2015/03/14 03:38:47 jsg Exp $ */ /* $NetBSD: siop.c,v 1.79 2005/11/18 23:10:32 bouyer Exp $ */ /* @@ -32,7 +32,6 @@ #include <sys/systm.h> #include <sys/device.h> #include <sys/malloc.h> -#include <sys/buf.h> #include <sys/kernel.h> #include <sys/endian.h> diff --git a/sys/dev/ic/smc83c170.c b/sys/dev/ic/smc83c170.c index 32ce7a904a9..04ad52a9b0a 100644 --- a/sys/dev/ic/smc83c170.c +++ b/sys/dev/ic/smc83c170.c @@ -1,4 +1,4 @@ -/* $OpenBSD: smc83c170.c,v 1.18 2014/12/22 02:28:51 tedu Exp $ */ +/* $OpenBSD: smc83c170.c,v 1.19 2015/03/14 03:38:47 jsg Exp $ */ /* $NetBSD: smc83c170.c,v 1.59 2005/02/27 00:27:02 perry Exp $ */ /*- @@ -50,7 +50,6 @@ #include <sys/device.h> #include <net/if.h> -#include <net/if_dl.h> #include <netinet/in.h> #include <netinet/if_ether.h> diff --git a/sys/dev/ic/smc91cxx.c b/sys/dev/ic/smc91cxx.c index 51a43d077f4..989bc780e2d 100644 --- a/sys/dev/ic/smc91cxx.c +++ b/sys/dev/ic/smc91cxx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: smc91cxx.c,v 1.37 2014/12/22 02:28:51 tedu Exp $ */ +/* $OpenBSD: smc91cxx.c,v 1.38 2015/03/14 03:38:47 jsg Exp $ */ /* $NetBSD: smc91cxx.c,v 1.11 1998/08/08 23:51:41 mycroft Exp $ */ /*- @@ -89,7 +89,6 @@ #include <machine/intr.h> #include <net/if.h> -#include <net/if_dl.h> #include <net/if_media.h> #include <netinet/in.h> diff --git a/sys/dev/ic/ti.c b/sys/dev/ic/ti.c index f98323449f1..dbcc1f9bdca 100644 --- a/sys/dev/ic/ti.c +++ b/sys/dev/ic/ti.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ti.c,v 1.12 2014/12/22 02:28:51 tedu Exp $ */ +/* $OpenBSD: ti.c,v 1.13 2015/03/14 03:38:47 jsg Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -85,7 +85,6 @@ #include <sys/queue.h> #include <net/if.h> -#include <net/if_dl.h> #include <net/if_types.h> #include <netinet/in.h> diff --git a/sys/dev/ic/twe.c b/sys/dev/ic/twe.c index 8f47b0650fa..7f5be840bcf 100644 --- a/sys/dev/ic/twe.c +++ b/sys/dev/ic/twe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: twe.c,v 1.44 2014/09/14 14:17:25 jsg Exp $ */ +/* $OpenBSD: twe.c,v 1.45 2015/03/14 03:38:47 jsg Exp $ */ /* * Copyright (c) 2000-2002 Michael Shalayeff. All rights reserved. @@ -34,7 +34,6 @@ #include <sys/systm.h> #include <sys/buf.h> #include <sys/device.h> -#include <sys/kernel.h> #include <sys/malloc.h> #include <sys/kthread.h> diff --git a/sys/dev/ic/xl.c b/sys/dev/ic/xl.c index 29af4c705b2..ff31a7f9cb2 100644 --- a/sys/dev/ic/xl.c +++ b/sys/dev/ic/xl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xl.c,v 1.121 2014/12/22 02:28:51 tedu Exp $ */ +/* $OpenBSD: xl.c,v 1.122 2015/03/14 03:38:47 jsg Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -121,7 +121,6 @@ #include <netinet/in.h> #include <netinet/if_ether.h> -#include <dev/mii/mii.h> #include <dev/mii/miivar.h> #include <machine/bus.h> diff --git a/sys/dev/isa/aps.c b/sys/dev/isa/aps.c index 00e66c36a98..fa1f4662e9d 100644 --- a/sys/dev/isa/aps.c +++ b/sys/dev/isa/aps.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aps.c,v 1.24 2011/04/04 10:17:13 deraadt Exp $ */ +/* $OpenBSD: aps.c,v 1.25 2015/03/14 03:38:47 jsg Exp $ */ /* * Copyright (c) 2005 Jonathan Gray <jsg@openbsd.org> * Copyright (c) 2008 Can Erkin Acar <canacar@openbsd.org> @@ -30,7 +30,6 @@ #include <machine/bus.h> #include <sys/event.h> -#include <dev/isa/isareg.h> #include <dev/isa/isavar.h> #ifdef __i386__ diff --git a/sys/dev/isa/com_isa.c b/sys/dev/isa/com_isa.c index 8ca742345fb..6f1c8bb85a1 100644 --- a/sys/dev/isa/com_isa.c +++ b/sys/dev/isa/com_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: com_isa.c,v 1.7 2013/12/09 19:52:00 deraadt Exp $ */ +/* $OpenBSD: com_isa.c,v 1.8 2015/03/14 03:38:47 jsg Exp $ */ /* * Copyright (c) 1997 - 1999, Jason Downs. All rights reserved. * @@ -64,7 +64,6 @@ #include <sys/tty.h> #include <sys/device.h> -#include <machine/intr.h> #include <machine/bus.h> #include <dev/ic/comreg.h> diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c index a0b863b6e54..311fcf32e93 100644 --- a/sys/dev/isa/fd.c +++ b/sys/dev/isa/fd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fd.c,v 1.101 2014/09/14 14:17:25 jsg Exp $ */ +/* $OpenBSD: fd.c,v 1.102 2015/03/14 03:38:47 jsg Exp $ */ /* $NetBSD: fd.c,v 1.90 1996/05/12 23:12:03 mycroft Exp $ */ /*- @@ -62,7 +62,6 @@ #include <machine/cpu.h> #include <machine/bus.h> -#include <machine/conf.h> #include <machine/intr.h> #include <machine/ioctl_fd.h> diff --git a/sys/dev/isa/fdc.c b/sys/dev/isa/fdc.c index a05581a9194..c7b7ae4562c 100644 --- a/sys/dev/isa/fdc.c +++ b/sys/dev/isa/fdc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fdc.c,v 1.19 2011/07/04 05:41:48 matthew Exp $ */ +/* $OpenBSD: fdc.c,v 1.20 2015/03/14 03:38:47 jsg Exp $ */ /* $NetBSD: fd.c,v 1.90 1996/05/12 23:12:03 mycroft Exp $ */ /*- @@ -65,7 +65,6 @@ #include <machine/ioctl_fd.h> #include <dev/isa/isavar.h> -#include <dev/isa/isadmavar.h> #include <dev/isa/fdreg.h> #if defined(__i386__) || defined(__amd64__) /* XXX */ diff --git a/sys/dev/isa/isa.c b/sys/dev/isa/isa.c index 5def3845b83..dbb5dc8b97e 100644 --- a/sys/dev/isa/isa.c +++ b/sys/dev/isa/isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isa.c,v 1.42 2014/07/12 18:48:18 tedu Exp $ */ +/* $OpenBSD: isa.c,v 1.43 2015/03/14 03:38:47 jsg Exp $ */ /* $NetBSD: isa.c,v 1.85 1996/05/14 00:31:04 thorpej Exp $ */ /* @@ -63,8 +63,6 @@ #include <sys/device.h> #include <sys/extent.h> -#include <machine/intr.h> - #include <dev/isa/isareg.h> #include <dev/isa/isavar.h> #include <dev/isa/isadmareg.h> diff --git a/sys/dev/isa/isadma.c b/sys/dev/isa/isadma.c index f79150c2f7e..7082d83695d 100644 --- a/sys/dev/isa/isadma.c +++ b/sys/dev/isa/isadma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isadma.c,v 1.33 2014/09/14 14:17:25 jsg Exp $ */ +/* $OpenBSD: isadma.c,v 1.34 2015/03/14 03:38:47 jsg Exp $ */ /* $NetBSD: isadma.c,v 1.32 1997/09/05 01:48:33 thorpej Exp $ */ /*- @@ -43,7 +43,6 @@ #include <machine/bus.h> -#include <dev/isa/isareg.h> #include <dev/isa/isavar.h> #include <dev/isa/isadmavar.h> #include <dev/isa/isadmareg.h> diff --git a/sys/dev/isa/it.c b/sys/dev/isa/it.c index b656e1ec57e..140db361aec 100644 --- a/sys/dev/isa/it.c +++ b/sys/dev/isa/it.c @@ -1,4 +1,4 @@ -/* $OpenBSD: it.c,v 1.45 2014/12/10 12:27:57 mikeb Exp $ */ +/* $OpenBSD: it.c,v 1.46 2015/03/14 03:38:47 jsg Exp $ */ /* * Copyright (c) 2007-2008 Oleg Safiullin <form@pdp-11.org.ru> @@ -34,7 +34,6 @@ #include <machine/bus.h> -#include <dev/isa/isareg.h> #include <dev/isa/isavar.h> #include <dev/isa/itvar.h> diff --git a/sys/dev/isa/lm78_isa.c b/sys/dev/isa/lm78_isa.c index 3b04bcc5850..44af60a229f 100644 --- a/sys/dev/isa/lm78_isa.c +++ b/sys/dev/isa/lm78_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lm78_isa.c,v 1.9 2015/01/02 22:36:15 dlg Exp $ */ +/* $OpenBSD: lm78_isa.c,v 1.10 2015/03/14 03:38:47 jsg Exp $ */ /* * Copyright (c) 2005, 2006 Mark Kettenis @@ -22,7 +22,6 @@ #include <sys/sensors.h> #include <machine/bus.h> -#include <dev/isa/isareg.h> #include <dev/isa/isavar.h> #include <dev/ic/lm78var.h> diff --git a/sys/dev/isa/lpt_isa.c b/sys/dev/isa/lpt_isa.c index f3d62dd57fa..684957a95b5 100644 --- a/sys/dev/isa/lpt_isa.c +++ b/sys/dev/isa/lpt_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lpt_isa.c,v 1.14 2013/06/12 19:07:39 deraadt Exp $ */ +/* $OpenBSD: lpt_isa.c,v 1.15 2015/03/14 03:38:47 jsg Exp $ */ /* * Copyright (c) 1993, 1994 Charles Hannum. @@ -58,7 +58,6 @@ #include <sys/device.h> #include <machine/bus.h> -#include <machine/intr.h> #include <dev/isa/isavar.h> #include <dev/ic/lptreg.h> diff --git a/sys/dev/isa/mpu401.c b/sys/dev/isa/mpu401.c index 062dce67dc6..e45a5cef9ca 100644 --- a/sys/dev/isa/mpu401.c +++ b/sys/dev/isa/mpu401.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpu401.c,v 1.14 2014/09/14 14:17:25 jsg Exp $ */ +/* $OpenBSD: mpu401.c,v 1.15 2015/03/14 03:38:47 jsg Exp $ */ /* $NetBSD: mpu401.c,v 1.3 1998/11/25 22:17:06 augustss Exp $ */ /* @@ -46,7 +46,6 @@ #include <dev/midi_if.h> #include <dev/isa/isavar.h> -#include <dev/isa/isadmavar.h> #include <dev/ic/mpuvar.h> diff --git a/sys/dev/isa/mpu_isa.c b/sys/dev/isa/mpu_isa.c index 09223ad3589..3a49d3f9631 100644 --- a/sys/dev/isa/mpu_isa.c +++ b/sys/dev/isa/mpu_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpu_isa.c,v 1.5 2014/09/14 14:17:25 jsg Exp $ */ +/* $OpenBSD: mpu_isa.c,v 1.6 2015/03/14 03:38:47 jsg Exp $ */ /* * Copyright (c) 2002 Sergey Smitienko. All rights reserved. @@ -37,7 +37,6 @@ #include <machine/bus.h> #include <sys/audioio.h> -#include <dev/audio_if.h> #include <dev/midi_if.h> #include <dev/isa/isavar.h> diff --git a/sys/dev/isa/pckbc_isa.c b/sys/dev/isa/pckbc_isa.c index f5be0f1f0f8..607eea4c756 100644 --- a/sys/dev/isa/pckbc_isa.c +++ b/sys/dev/isa/pckbc_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pckbc_isa.c,v 1.14 2013/12/06 21:03:03 deraadt Exp $ */ +/* $OpenBSD: pckbc_isa.c,v 1.15 2015/03/14 03:38:47 jsg Exp $ */ /* $NetBSD: pckbc_isa.c,v 1.2 2000/03/23 07:01:35 thorpej Exp $ */ /* @@ -28,7 +28,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/device.h> #include <sys/malloc.h> diff --git a/sys/dev/isa/sch311x.c b/sys/dev/isa/sch311x.c index 70eaf2966e0..eddec630dde 100644 --- a/sys/dev/isa/sch311x.c +++ b/sys/dev/isa/sch311x.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sch311x.c,v 1.14 2014/12/10 12:27:57 mikeb Exp $ */ +/* $OpenBSD: sch311x.c,v 1.15 2015/03/14 03:38:47 jsg Exp $ */ /* * Copyright (c) 2008 Mark Kettenis <kettenis@openbsd.org> * Copyright (c) 2009 Michael Knudsen <mk@openbsd.org> @@ -29,7 +29,6 @@ #include <machine/bus.h> -#include <dev/isa/isareg.h> #include <dev/isa/isavar.h> /* Device identifiers */ diff --git a/sys/dev/isa/skgpio.c b/sys/dev/isa/skgpio.c index 6d118ea7b16..10162ff0ed7 100644 --- a/sys/dev/isa/skgpio.c +++ b/sys/dev/isa/skgpio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: skgpio.c,v 1.2 2014/12/11 20:24:48 miod Exp $ */ +/* $OpenBSD: skgpio.c,v 1.3 2015/03/14 03:38:47 jsg Exp $ */ /* * Copyright (c) 2014 Matt Dainty <matt@bodgit-n-scarper.com> @@ -26,7 +26,6 @@ #include <sys/gpio.h> #include <machine/bus.h> -#include <machine/intr.h> #include <dev/isa/isavar.h> diff --git a/sys/dev/isa/uguru.c b/sys/dev/isa/uguru.c index dafe8cab419..06b4e3755b3 100644 --- a/sys/dev/isa/uguru.c +++ b/sys/dev/isa/uguru.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uguru.c,v 1.4 2010/06/03 17:48:24 deraadt Exp $ */ +/* $OpenBSD: uguru.c,v 1.5 2015/03/14 03:38:47 jsg Exp $ */ /* * Copyright (c) 2010 Mikko Tolmunen <oskari@sefirosu.org> @@ -23,7 +23,6 @@ #include <machine/bus.h> -#include <dev/isa/isareg.h> #include <dev/isa/isavar.h> #ifdef UGURU_DEBUG diff --git a/sys/dev/isa/wbsio.c b/sys/dev/isa/wbsio.c index 94beddaf840..7147d481732 100644 --- a/sys/dev/isa/wbsio.c +++ b/sys/dev/isa/wbsio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wbsio.c,v 1.9 2015/01/02 23:02:54 chris Exp $ */ +/* $OpenBSD: wbsio.c,v 1.10 2015/03/14 03:38:47 jsg Exp $ */ /* * Copyright (c) 2008 Mark Kettenis <kettenis@openbsd.org> * @@ -26,7 +26,6 @@ #include <machine/bus.h> -#include <dev/isa/isareg.h> #include <dev/isa/isavar.h> #include <dev/isa/wbsioreg.h> diff --git a/sys/dev/ksyms.c b/sys/dev/ksyms.c index d608564f803..cdcb1fa0802 100644 --- a/sys/dev/ksyms.c +++ b/sys/dev/ksyms.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ksyms.c,v 1.27 2015/02/10 21:56:09 miod Exp $ */ +/* $OpenBSD: ksyms.c,v 1.28 2015/03/14 03:38:46 jsg Exp $ */ /* * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com> * Copyright (c) 2001 Artur Grabowski <art@openbsd.org> @@ -26,7 +26,6 @@ */ #include <sys/param.h> -#include <sys/buf.h> #include <sys/exec.h> #include <sys/systm.h> #include <sys/uio.h> diff --git a/sys/dev/microcode/adw/adwmcode.c b/sys/dev/microcode/adw/adwmcode.c index 9773c19b908..9ec8fe000a2 100644 --- a/sys/dev/microcode/adw/adwmcode.c +++ b/sys/dev/microcode/adw/adwmcode.c @@ -1,4 +1,4 @@ -/* $OpenBSD: adwmcode.c,v 1.6 2014/09/14 14:17:25 jsg Exp $ */ +/* $OpenBSD: adwmcode.c,v 1.7 2015/03/14 03:38:47 jsg Exp $ */ /* $NetBSD: adwmcode.c,v 1.5 2000/05/27 18:24:50 dante Exp $ */ /* @@ -59,7 +59,6 @@ #include <sys/buf.h> #include <machine/bus.h> -#include <machine/intr.h> #include <uvm/uvm_extern.h> diff --git a/sys/dev/midi.c b/sys/dev/midi.c index a76f006f206..d2f00461b66 100644 --- a/sys/dev/midi.c +++ b/sys/dev/midi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: midi.c,v 1.33 2015/02/10 21:56:09 miod Exp $ */ +/* $OpenBSD: midi.c,v 1.34 2015/03/14 03:38:46 jsg Exp $ */ /* * Copyright (c) 2003, 2004 Alexandre Ratchov @@ -20,7 +20,6 @@ #include <sys/fcntl.h> #include <sys/systm.h> #include <sys/ioctl.h> -#include <sys/exec.h> #include <sys/conf.h> #include <sys/poll.h> #include <sys/kernel.h> diff --git a/sys/dev/mii/acphy.c b/sys/dev/mii/acphy.c index 094149e864e..6b1e1fb9e3b 100644 --- a/sys/dev/mii/acphy.c +++ b/sys/dev/mii/acphy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acphy.c,v 1.8 2014/12/05 15:50:04 mpi Exp $ */ +/* $OpenBSD: acphy.c,v 1.9 2015/03/14 03:38:47 jsg Exp $ */ /* $NetBSD: acphy.c,v 1.13 2003/04/29 01:49:33 thorpej Exp $ */ /* @@ -42,7 +42,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/device.h> #include <sys/socket.h> #include <sys/errno.h> diff --git a/sys/dev/mii/amphy.c b/sys/dev/mii/amphy.c index 99c706657c5..c34eeb9cbd0 100644 --- a/sys/dev/mii/amphy.c +++ b/sys/dev/mii/amphy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: amphy.c,v 1.20 2014/12/05 15:50:04 mpi Exp $ */ +/* $OpenBSD: amphy.c,v 1.21 2015/03/14 03:38:47 jsg Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -42,7 +42,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/device.h> #include <sys/socket.h> diff --git a/sys/dev/mii/atphy.c b/sys/dev/mii/atphy.c index 3a60ac5bf2a..793dda9009d 100644 --- a/sys/dev/mii/atphy.c +++ b/sys/dev/mii/atphy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: atphy.c,v 1.8 2014/12/05 15:50:04 mpi Exp $ */ +/* $OpenBSD: atphy.c,v 1.9 2015/03/14 03:38:47 jsg Exp $ */ /*- * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org> @@ -33,7 +33,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/device.h> #include <sys/socket.h> diff --git a/sys/dev/mii/bmtphy.c b/sys/dev/mii/bmtphy.c index aa6468bfaf9..ce82ebb65ba 100644 --- a/sys/dev/mii/bmtphy.c +++ b/sys/dev/mii/bmtphy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bmtphy.c,v 1.19 2014/12/05 15:50:04 mpi Exp $ */ +/* $OpenBSD: bmtphy.c,v 1.20 2015/03/14 03:38:47 jsg Exp $ */ /* $NetBSD: bmtphy.c,v 1.17 2005/01/17 13:17:45 scw Exp $ */ /*- @@ -34,7 +34,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/device.h> #include <sys/socket.h> #include <sys/errno.h> diff --git a/sys/dev/mii/ciphy.c b/sys/dev/mii/ciphy.c index 6279e79043e..01f85073b74 100644 --- a/sys/dev/mii/ciphy.c +++ b/sys/dev/mii/ciphy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ciphy.c,v 1.25 2014/12/05 15:50:04 mpi Exp $ */ +/* $OpenBSD: ciphy.c,v 1.26 2015/03/14 03:38:47 jsg Exp $ */ /* $FreeBSD: ciphy.c,v 1.1 2004/09/10 20:57:45 wpaul Exp $ */ /* * Copyright (c) 2004 @@ -43,8 +43,6 @@ #include <sys/socket.h> #include <sys/errno.h> -#include <machine/bus.h> - #include <net/if.h> #include <net/if_var.h> #include <net/if_media.h> diff --git a/sys/dev/mii/eephy.c b/sys/dev/mii/eephy.c index 4a3c897a529..2e3374b2005 100644 --- a/sys/dev/mii/eephy.c +++ b/sys/dev/mii/eephy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: eephy.c,v 1.55 2014/12/05 15:50:04 mpi Exp $ */ +/* $OpenBSD: eephy.c,v 1.56 2015/03/14 03:38:48 jsg Exp $ */ /* * Principal Author: Parag Patel * Copyright (c) 2001 @@ -42,7 +42,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/device.h> #include <sys/socket.h> diff --git a/sys/dev/mii/etphy.c b/sys/dev/mii/etphy.c index a87f4c00c29..8ab9f659bc4 100644 --- a/sys/dev/mii/etphy.c +++ b/sys/dev/mii/etphy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: etphy.c,v 1.6 2014/12/05 15:50:04 mpi Exp $ */ +/* $OpenBSD: etphy.c,v 1.7 2015/03/14 03:38:48 jsg Exp $ */ /* * Copyright (c) 2007 The DragonFly Project. All rights reserved. @@ -38,7 +38,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/device.h> #include <sys/socket.h> diff --git a/sys/dev/mii/exphy.c b/sys/dev/mii/exphy.c index 14717229dde..93ca03a16bd 100644 --- a/sys/dev/mii/exphy.c +++ b/sys/dev/mii/exphy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exphy.c,v 1.22 2014/12/05 15:50:04 mpi Exp $ */ +/* $OpenBSD: exphy.c,v 1.23 2015/03/14 03:38:48 jsg Exp $ */ /* $NetBSD: exphy.c,v 1.23 2000/02/02 23:34:56 thorpej Exp $ */ /*- @@ -61,7 +61,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/device.h> #include <sys/socket.h> diff --git a/sys/dev/mii/gentbi.c b/sys/dev/mii/gentbi.c index 90c46aa38b3..8fe93076dca 100644 --- a/sys/dev/mii/gentbi.c +++ b/sys/dev/mii/gentbi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gentbi.c,v 1.10 2014/12/05 15:50:04 mpi Exp $ */ +/* $OpenBSD: gentbi.c,v 1.11 2015/03/14 03:38:48 jsg Exp $ */ /* $NetBSD: gentbi.c,v 1.12 2004/04/11 15:40:56 thorpej Exp $ */ /*- @@ -75,7 +75,6 @@ #include <dev/mii/mii.h> #include <dev/mii/miivar.h> -#include <dev/mii/miidevs.h> int gentbimatch(struct device *, void *, void *); void gentbiattach(struct device *, struct device *, void *); diff --git a/sys/dev/mii/icsphy.c b/sys/dev/mii/icsphy.c index 7d28435235c..37147929b3a 100644 --- a/sys/dev/mii/icsphy.c +++ b/sys/dev/mii/icsphy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: icsphy.c,v 1.22 2014/12/05 15:50:04 mpi Exp $ */ +/* $OpenBSD: icsphy.c,v 1.23 2015/03/14 03:38:48 jsg Exp $ */ /* $NetBSD: icsphy.c,v 1.17 2000/02/02 23:34:56 thorpej Exp $ */ /*- @@ -63,7 +63,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/device.h> #include <sys/socket.h> diff --git a/sys/dev/mii/inphy.c b/sys/dev/mii/inphy.c index 455cc9e93c4..70e52fe8206 100644 --- a/sys/dev/mii/inphy.c +++ b/sys/dev/mii/inphy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: inphy.c,v 1.20 2014/12/05 15:50:04 mpi Exp $ */ +/* $OpenBSD: inphy.c,v 1.21 2015/03/14 03:38:48 jsg Exp $ */ /* $NetBSD: inphy.c,v 1.18 2000/02/02 23:34:56 thorpej Exp $ */ /*- @@ -62,7 +62,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/device.h> #include <sys/socket.h> #include <sys/errno.h> diff --git a/sys/dev/mii/iophy.c b/sys/dev/mii/iophy.c index 3cf188d4c3b..70aa69adf3d 100644 --- a/sys/dev/mii/iophy.c +++ b/sys/dev/mii/iophy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: iophy.c,v 1.19 2014/12/05 15:50:04 mpi Exp $ */ +/* $OpenBSD: iophy.c,v 1.20 2015/03/14 03:38:48 jsg Exp $ */ /* $NetBSD: iophy.c,v 1.8 2000/02/02 23:34:56 thorpej Exp $ */ /* @@ -61,7 +61,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/device.h> #include <sys/socket.h> diff --git a/sys/dev/mii/jmphy.c b/sys/dev/mii/jmphy.c index 172c29c120e..88133de067a 100644 --- a/sys/dev/mii/jmphy.c +++ b/sys/dev/mii/jmphy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: jmphy.c,v 1.5 2014/12/05 15:50:04 mpi Exp $ */ +/* $OpenBSD: jmphy.c,v 1.6 2015/03/14 03:38:48 jsg Exp $ */ /*- * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org> * All rights reserved. @@ -35,7 +35,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/device.h> #include <sys/socket.h> diff --git a/sys/dev/mii/luphy.c b/sys/dev/mii/luphy.c index 3b2ad813c15..e65c97ce29b 100644 --- a/sys/dev/mii/luphy.c +++ b/sys/dev/mii/luphy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: luphy.c,v 1.5 2014/12/05 15:50:04 mpi Exp $ */ +/* $OpenBSD: luphy.c,v 1.6 2015/03/14 03:38:48 jsg Exp $ */ /*- * Copyright (c) 2004 Marius Strobl @@ -43,7 +43,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/device.h> #include <sys/socket.h> diff --git a/sys/dev/mii/lxtphy.c b/sys/dev/mii/lxtphy.c index 2bf065d0f4f..89e6b0732cd 100644 --- a/sys/dev/mii/lxtphy.c +++ b/sys/dev/mii/lxtphy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lxtphy.c,v 1.19 2014/12/05 15:50:04 mpi Exp $ */ +/* $OpenBSD: lxtphy.c,v 1.20 2015/03/14 03:38:48 jsg Exp $ */ /* $NetBSD: lxtphy.c,v 1.19 2000/02/02 23:34:57 thorpej Exp $ */ /*- @@ -62,7 +62,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/device.h> #include <sys/socket.h> #include <sys/errno.h> diff --git a/sys/dev/mii/mtdphy.c b/sys/dev/mii/mtdphy.c index 1d5737abda6..477c7f5ecd9 100644 --- a/sys/dev/mii/mtdphy.c +++ b/sys/dev/mii/mtdphy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mtdphy.c,v 1.14 2014/12/05 15:50:04 mpi Exp $ */ +/* $OpenBSD: mtdphy.c,v 1.15 2015/03/14 03:38:48 jsg Exp $ */ /* * Copyright (c) 1998, 1999 Jason L. Wright (jason@thought.net) @@ -44,7 +44,6 @@ #include <dev/mii/mii.h> #include <dev/mii/miivar.h> #include <dev/mii/miidevs.h> -#include <dev/mii/mtdphyreg.h> int mtdphymatch(struct device *, void *, void *); void mtdphyattach(struct device *, struct device *, void *); diff --git a/sys/dev/mii/nsgphy.c b/sys/dev/mii/nsgphy.c index bd7f3ddae30..34a0853274e 100644 --- a/sys/dev/mii/nsgphy.c +++ b/sys/dev/mii/nsgphy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nsgphy.c,v 1.24 2014/12/05 15:50:04 mpi Exp $ */ +/* $OpenBSD: nsgphy.c,v 1.25 2015/03/14 03:38:48 jsg Exp $ */ /* * Copyright (c) 2001 Wind River Systems * Copyright (c) 2001 @@ -52,7 +52,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/device.h> #include <sys/socket.h> diff --git a/sys/dev/mii/nsphy.c b/sys/dev/mii/nsphy.c index 4af922ae95c..69df14da098 100644 --- a/sys/dev/mii/nsphy.c +++ b/sys/dev/mii/nsphy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nsphy.c,v 1.27 2014/12/05 15:50:04 mpi Exp $ */ +/* $OpenBSD: nsphy.c,v 1.28 2015/03/14 03:38:48 jsg Exp $ */ /* $NetBSD: nsphy.c,v 1.25 2000/02/02 23:34:57 thorpej Exp $ */ /*- @@ -62,7 +62,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/device.h> #include <sys/socket.h> #include <sys/errno.h> diff --git a/sys/dev/mii/nsphyter.c b/sys/dev/mii/nsphyter.c index 7d208adbba3..3733edf02cb 100644 --- a/sys/dev/mii/nsphyter.c +++ b/sys/dev/mii/nsphyter.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nsphyter.c,v 1.18 2014/12/05 15:50:04 mpi Exp $ */ +/* $OpenBSD: nsphyter.c,v 1.19 2015/03/14 03:38:48 jsg Exp $ */ /* $NetBSD: nsphyter.c,v 1.5 2000/02/02 23:34:57 thorpej Exp $ */ /*- @@ -62,7 +62,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/device.h> #include <sys/socket.h> #include <sys/errno.h> diff --git a/sys/dev/mii/qsphy.c b/sys/dev/mii/qsphy.c index 2b854d17e87..4f7b3139462 100644 --- a/sys/dev/mii/qsphy.c +++ b/sys/dev/mii/qsphy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: qsphy.c,v 1.20 2014/12/05 15:50:04 mpi Exp $ */ +/* $OpenBSD: qsphy.c,v 1.21 2015/03/14 03:38:48 jsg Exp $ */ /* $NetBSD: qsphy.c,v 1.19 2000/02/02 23:34:57 thorpej Exp $ */ /*- @@ -62,7 +62,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/device.h> #include <sys/socket.h> diff --git a/sys/dev/mii/sqphy.c b/sys/dev/mii/sqphy.c index 75d7f00cf9f..af156e25d07 100644 --- a/sys/dev/mii/sqphy.c +++ b/sys/dev/mii/sqphy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sqphy.c,v 1.20 2014/12/05 15:50:04 mpi Exp $ */ +/* $OpenBSD: sqphy.c,v 1.21 2015/03/14 03:38:48 jsg Exp $ */ /* $NetBSD: sqphy.c,v 1.17 2000/02/02 23:34:57 thorpej Exp $ */ /*- @@ -61,7 +61,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/device.h> #include <sys/socket.h> #include <sys/errno.h> diff --git a/sys/dev/mii/tqphy.c b/sys/dev/mii/tqphy.c index a08072cce07..c258f805369 100644 --- a/sys/dev/mii/tqphy.c +++ b/sys/dev/mii/tqphy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tqphy.c,v 1.17 2014/12/05 15:50:04 mpi Exp $ */ +/* $OpenBSD: tqphy.c,v 1.18 2015/03/14 03:38:48 jsg Exp $ */ /* $NetBSD: tqphy.c,v 1.9 2000/02/02 23:34:57 thorpej Exp $ */ /* @@ -63,7 +63,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/device.h> #include <sys/socket.h> diff --git a/sys/dev/mii/ukphy.c b/sys/dev/mii/ukphy.c index 665dcc47122..8bd328f45b7 100644 --- a/sys/dev/mii/ukphy.c +++ b/sys/dev/mii/ukphy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ukphy.c,v 1.22 2014/12/05 15:50:04 mpi Exp $ */ +/* $OpenBSD: ukphy.c,v 1.23 2015/03/14 03:38:48 jsg Exp $ */ /* $NetBSD: ukphy.c,v 1.9 2000/02/02 23:34:57 thorpej Exp $ */ /*- @@ -61,7 +61,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/device.h> #include <sys/socket.h> #include <sys/errno.h> diff --git a/sys/dev/mii/urlphy.c b/sys/dev/mii/urlphy.c index cb33f6c17b4..6018d2b2a5e 100644 --- a/sys/dev/mii/urlphy.c +++ b/sys/dev/mii/urlphy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: urlphy.c,v 1.16 2014/12/05 15:50:04 mpi Exp $ */ +/* $OpenBSD: urlphy.c,v 1.17 2015/03/14 03:38:48 jsg Exp $ */ /* $NetBSD: urlphy.c,v 1.1 2002/03/28 21:07:53 ichiro Exp $ */ /* * Copyright (c) 2001, 2002 @@ -46,7 +46,6 @@ #include <dev/mii/mii.h> #include <dev/mii/miivar.h> -#include <dev/mii/miidevs.h> #include <dev/mii/urlphyreg.h> #define URLPHY_DEBUG 0 diff --git a/sys/dev/mii/xmphy.c b/sys/dev/mii/xmphy.c index 31d21e349a8..529320a9a3c 100644 --- a/sys/dev/mii/xmphy.c +++ b/sys/dev/mii/xmphy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xmphy.c,v 1.21 2014/12/05 15:50:04 mpi Exp $ */ +/* $OpenBSD: xmphy.c,v 1.22 2015/03/14 03:38:48 jsg Exp $ */ /* * Copyright (c) 2000 @@ -42,7 +42,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/device.h> #include <sys/socket.h> #include <sys/errno.h> diff --git a/sys/dev/mulaw.c b/sys/dev/mulaw.c index 7e97bc45f19..c2a340c1f68 100644 --- a/sys/dev/mulaw.c +++ b/sys/dev/mulaw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mulaw.c,v 1.14 2007/10/23 19:54:36 jakemsr Exp $ */ +/* $OpenBSD: mulaw.c,v 1.15 2015/03/14 03:38:46 jsg Exp $ */ /* $NetBSD: mulaw.c,v 1.15 2001/01/18 20:28:20 jdolecek Exp $ */ /* @@ -36,7 +36,6 @@ */ #include <sys/types.h> -#include <sys/audioio.h> #include <dev/mulaw.h> /* diff --git a/sys/dev/onewire/owctr.c b/sys/dev/onewire/owctr.c index 46c4f349efd..d9092d61add 100644 --- a/sys/dev/onewire/owctr.c +++ b/sys/dev/onewire/owctr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: owctr.c,v 1.6 2014/09/14 14:17:25 jsg Exp $ */ +/* $OpenBSD: owctr.c,v 1.7 2015/03/14 03:38:48 jsg Exp $ */ /* * Copyright (c) 2010 John L. Scarfone <john@scarfone.net> * @@ -25,7 +25,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> -#include <sys/kernel.h> #include <sys/malloc.h> #include <sys/rwlock.h> #include <sys/sensors.h> diff --git a/sys/dev/onewire/owid.c b/sys/dev/onewire/owid.c index b0f2f2a64de..6d33f5e6e36 100644 --- a/sys/dev/onewire/owid.c +++ b/sys/dev/onewire/owid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: owid.c,v 1.10 2014/09/14 14:17:25 jsg Exp $ */ +/* $OpenBSD: owid.c,v 1.11 2015/03/14 03:38:48 jsg Exp $ */ /* * Copyright (c) 2006 Alexander Yurchenko <grange@openbsd.org> @@ -23,7 +23,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> -#include <sys/kernel.h> #include <sys/sensors.h> #include <dev/onewire/onewiredevs.h> diff --git a/sys/dev/onewire/owsbm.c b/sys/dev/onewire/owsbm.c index 2b19a00477a..5a2e55d581b 100644 --- a/sys/dev/onewire/owsbm.c +++ b/sys/dev/onewire/owsbm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: owsbm.c,v 1.9 2014/09/14 14:17:25 jsg Exp $ */ +/* $OpenBSD: owsbm.c,v 1.10 2015/03/14 03:38:48 jsg Exp $ */ /* * Copyright (c) 2007 Aaron Linville <aaron@linville.org> @@ -26,7 +26,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> -#include <sys/kernel.h> #include <sys/rwlock.h> #include <sys/sensors.h> diff --git a/sys/dev/pci/adw_pci.c b/sys/dev/pci/adw_pci.c index 02e14bb0983..dcd9851bdd3 100644 --- a/sys/dev/pci/adw_pci.c +++ b/sys/dev/pci/adw_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: adw_pci.c,v 1.16 2011/04/03 15:36:02 jasper Exp $ */ +/* $OpenBSD: adw_pci.c,v 1.17 2015/03/14 03:38:48 jsg Exp $ */ /* $NetBSD: adw_pci.c,v 1.7 2000/05/26 15:13:46 dante Exp $ */ /* @@ -51,7 +51,6 @@ #include <sys/timeout.h> #include <machine/bus.h> -#include <machine/intr.h> #include <scsi/scsi_all.h> #include <scsi/scsiconf.h> diff --git a/sys/dev/pci/ahc_pci.c b/sys/dev/pci/ahc_pci.c index 75851c17456..6ccb019e6e2 100644 --- a/sys/dev/pci/ahc_pci.c +++ b/sys/dev/pci/ahc_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ahc_pci.c,v 1.56 2014/05/08 18:09:22 sf Exp $ */ +/* $OpenBSD: ahc_pci.c,v 1.57 2015/03/14 03:38:48 jsg Exp $ */ /* $NetBSD: ahc_pci.c,v 1.43 2003/08/18 09:16:22 taca Exp $ */ /* @@ -42,7 +42,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * - * $Id: ahc_pci.c,v 1.56 2014/05/08 18:09:22 sf Exp $ + * $Id: ahc_pci.c,v 1.57 2015/03/14 03:38:48 jsg Exp $ * * //depot/aic7xxx/aic7xxx/aic7xxx_pci.c#57 $ * @@ -72,8 +72,6 @@ #include <dev/ic/aic7xxx_openbsd.h> #include <dev/ic/aic7xxx_inline.h> -#include <dev/ic/smc93cx6var.h> - #ifndef __i386__ #define AHC_ALLOW_MEMIO #endif diff --git a/sys/dev/pci/ahci_pci.c b/sys/dev/pci/ahci_pci.c index 70defa22f03..df581fa24b6 100644 --- a/sys/dev/pci/ahci_pci.c +++ b/sys/dev/pci/ahci_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ahci_pci.c,v 1.10 2015/02/27 15:29:18 kettenis Exp $ */ +/* $OpenBSD: ahci_pci.c,v 1.11 2015/03/14 03:38:48 jsg Exp $ */ /* * Copyright (c) 2006 David Gwynne <dlg@openbsd.org> @@ -35,7 +35,6 @@ #include <dev/pci/pcivar.h> #include <dev/pci/pcidevs.h> -#include <dev/ata/atascsi.h> #include <dev/ata/pmreg.h> #include <dev/ic/ahcireg.h> diff --git a/sys/dev/pci/amdpcib.c b/sys/dev/pci/amdpcib.c index c6ac0cfceff..d960472ff15 100644 --- a/sys/dev/pci/amdpcib.c +++ b/sys/dev/pci/amdpcib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: amdpcib.c,v 1.2 2010/04/20 22:05:43 tedu Exp $ */ +/* $OpenBSD: amdpcib.c,v 1.3 2015/03/14 03:38:48 jsg Exp $ */ /* * Copyright (c) 2007 Michael Shalayeff @@ -28,7 +28,6 @@ #include <machine/bus.h> -#include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> #include <dev/pci/pcidevs.h> diff --git a/sys/dev/pci/auacer.c b/sys/dev/pci/auacer.c index c929479cfa5..7a9fd7e905e 100644 --- a/sys/dev/pci/auacer.c +++ b/sys/dev/pci/auacer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auacer.c,v 1.16 2014/07/12 18:48:51 tedu Exp $ */ +/* $OpenBSD: auacer.c,v 1.17 2015/03/14 03:38:48 jsg Exp $ */ /* $NetBSD: auacer.c,v 1.3 2004/11/10 04:20:26 kent Exp $ */ /*- @@ -44,7 +44,6 @@ #include <sys/kernel.h> #include <sys/malloc.h> #include <sys/device.h> -#include <sys/fcntl.h> #include <dev/pci/pcidevs.h> #include <dev/pci/pcivar.h> diff --git a/sys/dev/pci/auich.c b/sys/dev/pci/auich.c index a5f45f15ba1..94adc5a3b71 100644 --- a/sys/dev/pci/auich.c +++ b/sys/dev/pci/auich.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auich.c,v 1.102 2014/09/24 08:35:12 mpi Exp $ */ +/* $OpenBSD: auich.c,v 1.103 2015/03/14 03:38:48 jsg Exp $ */ /* * Copyright (c) 2000,2001 Michael Shalayeff @@ -36,7 +36,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/malloc.h> #include <sys/device.h> diff --git a/sys/dev/pci/auixp.c b/sys/dev/pci/auixp.c index f4e30ba11ec..1291bfdb8fc 100644 --- a/sys/dev/pci/auixp.c +++ b/sys/dev/pci/auixp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auixp.c,v 1.33 2014/07/12 18:48:51 tedu Exp $ */ +/* $OpenBSD: auixp.c,v 1.34 2015/03/14 03:38:48 jsg Exp $ */ /* $NetBSD: auixp.c,v 1.9 2005/06/27 21:13:09 thorpej Exp $ */ /* @@ -63,7 +63,6 @@ #include <sys/queue.h> #include <machine/bus.h> -#include <machine/intr.h> #include <dev/pci/pcidevs.h> #include <dev/pci/pcivar.h> diff --git a/sys/dev/pci/bktr/bktr_audio.c b/sys/dev/pci/bktr/bktr_audio.c index 6deb2b7aa32..a6ebc1c805d 100644 --- a/sys/dev/pci/bktr/bktr_audio.c +++ b/sys/dev/pci/bktr/bktr_audio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bktr_audio.c,v 1.11 2014/09/14 14:17:25 jsg Exp $ */ +/* $OpenBSD: bktr_audio.c,v 1.12 2015/03/14 03:38:49 jsg Exp $ */ /* $FreeBSD: src/sys/dev/bktr/bktr_audio.c,v 1.8 2000/10/31 13:09:56 roger Exp $ */ /* * This is part of the Driver for Video Capture Cards (Frame grabbers) @@ -55,7 +55,6 @@ #include <dev/ic/bt8xx.h> /* OpenBSD location of .h files */ #include <dev/pci/bktr/bktr_reg.h> #include <dev/pci/bktr/bktr_core.h> -#include <dev/pci/bktr/bktr_tuner.h> #include <dev/pci/bktr/bktr_card.h> #include <dev/pci/bktr/bktr_audio.h> diff --git a/sys/dev/pci/bktr/bktr_core.c b/sys/dev/pci/bktr/bktr_core.c index 156de997e91..8f59929e433 100644 --- a/sys/dev/pci/bktr/bktr_core.c +++ b/sys/dev/pci/bktr/bktr_core.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bktr_core.c,v 1.35 2015/02/10 21:56:09 miod Exp $ */ +/* $OpenBSD: bktr_core.c,v 1.36 2015/03/14 03:38:49 jsg Exp $ */ /* $FreeBSD: src/sys/dev/bktr/bktr_core.c,v 1.114 2000/10/31 13:09:56 roger Exp $ */ /* @@ -100,7 +100,6 @@ #include <sys/kernel.h> #include <sys/signalvar.h> #include <sys/vnode.h> -#include <sys/stdint.h> /* uintptr_t */ #include <uvm/uvm_extern.h> diff --git a/sys/dev/pci/bktr/bktr_os.c b/sys/dev/pci/bktr/bktr_os.c index 48a3e5ddf74..5dd4f27efba 100644 --- a/sys/dev/pci/bktr/bktr_os.c +++ b/sys/dev/pci/bktr/bktr_os.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bktr_os.c,v 1.31 2013/07/01 07:18:23 brad Exp $ */ +/* $OpenBSD: bktr_os.c,v 1.32 2015/03/14 03:38:49 jsg Exp $ */ /* $FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.20 2000/10/20 08:16:53 roger Exp $ */ /* @@ -85,7 +85,6 @@ int bktr_debug = 1; #include <dev/ic/bt8xx.h> /* OpenBSD location for .h files */ #include <dev/pci/bktr/bktr_reg.h> #include <dev/pci/bktr/bktr_tuner.h> -#include <dev/pci/bktr/bktr_card.h> #include <dev/pci/bktr/bktr_audio.h> #include <dev/pci/bktr/bktr_core.h> #include <dev/pci/bktr/bktr_os.h> diff --git a/sys/dev/pci/bktr/bktr_tuner.c b/sys/dev/pci/bktr/bktr_tuner.c index 013b0be4a68..859aecff755 100644 --- a/sys/dev/pci/bktr/bktr_tuner.c +++ b/sys/dev/pci/bktr/bktr_tuner.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bktr_tuner.c,v 1.7 2014/09/14 14:17:25 jsg Exp $ */ +/* $OpenBSD: bktr_tuner.c,v 1.8 2015/03/14 03:38:49 jsg Exp $ */ /* $FreeBSD: src/sys/dev/bktr/bktr_tuner.c,v 1.9 2000/10/19 07:33:28 roger Exp $ */ /* @@ -54,7 +54,6 @@ #include <dev/ic/bt8xx.h> /* OpenBSD .h file location */ #include <dev/pci/bktr/bktr_reg.h> #include <dev/pci/bktr/bktr_tuner.h> -#include <dev/pci/bktr/bktr_card.h> #include <dev/pci/bktr/bktr_core.h> #if defined( TUNER_AFC ) diff --git a/sys/dev/pci/cmpci.c b/sys/dev/pci/cmpci.c index b09e5b2dbcf..cb84442f414 100644 --- a/sys/dev/pci/cmpci.c +++ b/sys/dev/pci/cmpci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmpci.c,v 1.37 2014/07/12 18:48:51 tedu Exp $ */ +/* $OpenBSD: cmpci.c,v 1.38 2015/03/14 03:38:48 jsg Exp $ */ /* $NetBSD: cmpci.c,v 1.25 2004/10/26 06:32:20 xtraeme Exp $ */ /* @@ -67,7 +67,6 @@ int cmpcidebug = 0; #include <dev/pci/cmpcireg.h> #include <dev/pci/cmpcivar.h> -#include <dev/ic/mpuvar.h> #include <machine/bus.h> #include <machine/intr.h> diff --git a/sys/dev/pci/cs4280.c b/sys/dev/pci/cs4280.c index 671e50cc9de..266079dca8f 100644 --- a/sys/dev/pci/cs4280.c +++ b/sys/dev/pci/cs4280.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cs4280.c,v 1.45 2014/07/12 18:48:51 tedu Exp $ */ +/* $OpenBSD: cs4280.c,v 1.46 2015/03/14 03:38:48 jsg Exp $ */ /* $NetBSD: cs4280.c,v 1.5 2000/06/26 04:56:23 simonb Exp $ */ /* @@ -78,7 +78,6 @@ int cs4280debug = 0; #include <sys/audioio.h> #include <dev/audio_if.h> -#include <dev/midi_if.h> #include <dev/mulaw.h> #include <dev/auconv.h> diff --git a/sys/dev/pci/cy82c693.c b/sys/dev/pci/cy82c693.c index 722d3099873..f7baa449a65 100644 --- a/sys/dev/pci/cy82c693.c +++ b/sys/dev/pci/cy82c693.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cy82c693.c,v 1.7 2010/04/24 08:32:15 kettenis Exp $ */ +/* $OpenBSD: cy82c693.c,v 1.8 2015/03/14 03:38:48 jsg Exp $ */ /* $NetBSD: cy82c693.c,v 1.1 2000/06/06 03:07:39 thorpej Exp $ */ /*- @@ -41,7 +41,6 @@ #include <machine/bus.h> -#include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> #include <dev/pci/cy82c693reg.h> diff --git a/sys/dev/pci/eap.c b/sys/dev/pci/eap.c index 5f08b1f0586..1c77404505b 100644 --- a/sys/dev/pci/eap.c +++ b/sys/dev/pci/eap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: eap.c,v 1.49 2014/08/20 06:03:20 doug Exp $ */ +/* $OpenBSD: eap.c,v 1.50 2015/03/14 03:38:48 jsg Exp $ */ /* $NetBSD: eap.c,v 1.46 2001/09/03 15:07:37 reinoud Exp $ */ /* @@ -53,7 +53,6 @@ #include <sys/systm.h> #include <sys/kernel.h> #include <sys/fcntl.h> -#include <sys/malloc.h> #include <sys/device.h> #include <dev/pci/pcidevs.h> diff --git a/sys/dev/pci/emuxki.c b/sys/dev/pci/emuxki.c index 740c0e74879..63cc9235f6c 100644 --- a/sys/dev/pci/emuxki.c +++ b/sys/dev/pci/emuxki.c @@ -1,4 +1,4 @@ -/* $OpenBSD: emuxki.c,v 1.46 2014/07/13 23:10:23 deraadt Exp $ */ +/* $OpenBSD: emuxki.c,v 1.47 2015/03/14 03:38:48 jsg Exp $ */ /* $NetBSD: emuxki.c,v 1.1 2001/10/17 18:39:41 jdolecek Exp $ */ /*- @@ -57,7 +57,6 @@ #include <sys/systm.h> #include <sys/param.h> #include <sys/audioio.h> -#include <sys/selinfo.h> #include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> diff --git a/sys/dev/pci/envy.c b/sys/dev/pci/envy.c index f85c8a17c92..acf77cea608 100644 --- a/sys/dev/pci/envy.c +++ b/sys/dev/pci/envy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: envy.c,v 1.58 2014/05/29 20:40:26 ratchov Exp $ */ +/* $OpenBSD: envy.c,v 1.59 2015/03/14 03:38:48 jsg Exp $ */ /* * Copyright (c) 2007 Alexandre Ratchov <alex@caoua.org> * @@ -30,7 +30,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> -#include <sys/ioctl.h> #include <sys/audioio.h> #include <sys/malloc.h> #include <sys/kernel.h> diff --git a/sys/dev/pci/gdt_pci.c b/sys/dev/pci/gdt_pci.c index 573d9a2bc09..82aa31d331c 100644 --- a/sys/dev/pci/gdt_pci.c +++ b/sys/dev/pci/gdt_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gdt_pci.c,v 1.24 2014/12/19 22:44:58 guenther Exp $ */ +/* $OpenBSD: gdt_pci.c,v 1.25 2015/03/14 03:38:48 jsg Exp $ */ /* * Copyright (c) 1999, 2000 Niklas Hallqvist. All rights reserved. @@ -38,7 +38,6 @@ #include <sys/endian.h> #include <machine/bus.h> -#include <machine/intr.h> #include <scsi/scsi_all.h> #include <scsi/scsiconf.h> diff --git a/sys/dev/pci/if_acx_pci.c b/sys/dev/pci/if_acx_pci.c index fe7ee15d42e..bf913271759 100644 --- a/sys/dev/pci/if_acx_pci.c +++ b/sys/dev/pci/if_acx_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_acx_pci.c,v 1.7 2009/03/29 21:53:52 sthen Exp $ */ +/* $OpenBSD: if_acx_pci.c,v 1.8 2015/03/14 03:38:48 jsg Exp $ */ /*- * Copyright (c) 2006 Theo de Raadt <deraadt@openbsd.org> @@ -49,7 +49,6 @@ #include <net80211/ieee80211_radiotap.h> #include <dev/ic/acxvar.h> -#include <dev/ic/acxreg.h> #include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> diff --git a/sys/dev/pci/if_age.c b/sys/dev/pci/if_age.c index a69585b548d..b81d77facc5 100644 --- a/sys/dev/pci/if_age.c +++ b/sys/dev/pci/if_age.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_age.c,v 1.25 2014/12/22 02:28:51 tedu Exp $ */ +/* $OpenBSD: if_age.c,v 1.26 2015/03/14 03:38:48 jsg Exp $ */ /*- * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org> @@ -53,7 +53,6 @@ #include <netinet/in.h> #include <netinet/if_ether.h> -#include <net/if_types.h> #include <net/if_vlan_var.h> #if NBPFILTER > 0 diff --git a/sys/dev/pci/if_alc.c b/sys/dev/pci/if_alc.c index 44ca6539687..656d553c885 100644 --- a/sys/dev/pci/if_alc.c +++ b/sys/dev/pci/if_alc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_alc.c,v 1.30 2014/12/22 02:28:51 tedu Exp $ */ +/* $OpenBSD: if_alc.c,v 1.31 2015/03/14 03:38:48 jsg Exp $ */ /*- * Copyright (c) 2009, Pyun YongHyeon <yongari@FreeBSD.org> * All rights reserved. @@ -52,7 +52,6 @@ #include <netinet/in.h> #include <netinet/if_ether.h> -#include <net/if_types.h> #include <net/if_vlan_var.h> #if NBPFILTER > 0 diff --git a/sys/dev/pci/if_ale.c b/sys/dev/pci/if_ale.c index dbd33fe091a..9d89775a2df 100644 --- a/sys/dev/pci/if_ale.c +++ b/sys/dev/pci/if_ale.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ale.c,v 1.35 2014/12/22 02:28:51 tedu Exp $ */ +/* $OpenBSD: if_ale.c,v 1.36 2015/03/14 03:38:48 jsg Exp $ */ /*- * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org> * All rights reserved. @@ -56,7 +56,6 @@ #include <netinet/ip.h> #include <netinet/if_ether.h> -#include <net/if_types.h> #include <net/if_vlan_var.h> #if NBPFILTER > 0 diff --git a/sys/dev/pci/if_bce.c b/sys/dev/pci/if_bce.c index 415c0792930..92f9e146099 100644 --- a/sys/dev/pci/if_bce.c +++ b/sys/dev/pci/if_bce.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bce.c,v 1.42 2015/01/27 00:59:39 brad Exp $ */ +/* $OpenBSD: if_bce.c,v 1.43 2015/03/14 03:38:48 jsg Exp $ */ /* $NetBSD: if_bce.c,v 1.3 2003/09/29 01:53:02 mrg Exp $ */ /* @@ -64,7 +64,6 @@ #include <dev/mii/mii.h> #include <dev/mii/miivar.h> #include <dev/mii/miidevs.h> -#include <dev/mii/brgphyreg.h> #include <dev/pci/if_bcereg.h> diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c index 7be005981ef..b761ea90020 100644 --- a/sys/dev/pci/if_bge.c +++ b/sys/dev/pci/if_bge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bge.c,v 1.365 2015/02/09 09:51:16 dlg Exp $ */ +/* $OpenBSD: if_bge.c,v 1.366 2015/03/14 03:38:48 jsg Exp $ */ /* * Copyright (c) 2001 Wind River Systems @@ -110,7 +110,6 @@ #include <dev/pci/pcivar.h> #include <dev/pci/pcidevs.h> -#include <dev/mii/mii.h> #include <dev/mii/miivar.h> #include <dev/mii/miidevs.h> #include <dev/mii/brgphyreg.h> diff --git a/sys/dev/pci/if_bwi_pci.c b/sys/dev/pci/if_bwi_pci.c index fe85e67afe4..f9fc342652a 100644 --- a/sys/dev/pci/if_bwi_pci.c +++ b/sys/dev/pci/if_bwi_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bwi_pci.c,v 1.14 2013/12/06 21:03:04 deraadt Exp $ */ +/* $OpenBSD: if_bwi_pci.c,v 1.15 2015/03/14 03:38:48 jsg Exp $ */ /* * Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org> @@ -33,7 +33,6 @@ #include <sys/device.h> #include <machine/bus.h> -#include <machine/intr.h> #include <net/if.h> #include <net/if_dl.h> diff --git a/sys/dev/pci/if_cas.c b/sys/dev/pci/if_cas.c index 314d3e3380d..349ef097965 100644 --- a/sys/dev/pci/if_cas.c +++ b/sys/dev/pci/if_cas.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_cas.c,v 1.38 2015/03/11 22:15:22 mpi Exp $ */ +/* $OpenBSD: if_cas.c,v 1.39 2015/03/14 03:38:48 jsg Exp $ */ /* * @@ -73,7 +73,6 @@ #include <dev/mii/mii.h> #include <dev/mii/miivar.h> -#include <dev/mii/mii_bitbang.h> #include <dev/pci/if_casreg.h> #include <dev/pci/if_casvar.h> diff --git a/sys/dev/pci/if_dc_pci.c b/sys/dev/pci/if_dc_pci.c index 306cb28a4a9..a144cd78b2b 100644 --- a/sys/dev/pci/if_dc_pci.c +++ b/sys/dev/pci/if_dc_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_dc_pci.c,v 1.71 2014/12/22 02:28:52 tedu Exp $ */ +/* $OpenBSD: if_dc_pci.c,v 1.72 2015/03/14 03:38:48 jsg Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -61,7 +61,6 @@ #include <net/bpf.h> #endif -#include <dev/mii/mii.h> #include <dev/mii/miivar.h> #include <dev/pci/pcireg.h> diff --git a/sys/dev/pci/if_de.c b/sys/dev/pci/if_de.c index af82b484c04..1d6a13aebd9 100644 --- a/sys/dev/pci/if_de.c +++ b/sys/dev/pci/if_de.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_de.c,v 1.117 2014/12/22 02:28:52 tedu Exp $ */ +/* $OpenBSD: if_de.c,v 1.118 2015/03/14 03:38:48 jsg Exp $ */ /* $NetBSD: if_de.c,v 1.58 1998/01/12 09:39:58 thorpej Exp $ */ /*- @@ -68,7 +68,6 @@ #include <machine/intr.h> #include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> -#include <dev/pci/pcidevs.h> #include <dev/ic/dc21040reg.h> /* diff --git a/sys/dev/pci/if_em_hw.c b/sys/dev/pci/if_em_hw.c index 16cd3ee9136..bcd1c0421ba 100644 --- a/sys/dev/pci/if_em_hw.c +++ b/sys/dev/pci/if_em_hw.c @@ -31,7 +31,7 @@ *******************************************************************************/ -/* $OpenBSD: if_em_hw.c,v 1.82 2014/12/22 02:28:52 tedu Exp $ */ +/* $OpenBSD: if_em_hw.c,v 1.83 2015/03/14 03:38:48 jsg Exp $ */ /* * if_em_hw.c Shared functions for accessing and configuring the MAC */ @@ -56,7 +56,6 @@ #include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> -#include <dev/pci/pcidevs.h> #include <dev/pci/if_em_hw.h> #include <dev/pci/if_em_soc.h> diff --git a/sys/dev/pci/if_ep_pci.c b/sys/dev/pci/if_ep_pci.c index 032fe8c675c..86a56690a27 100644 --- a/sys/dev/pci/if_ep_pci.c +++ b/sys/dev/pci/if_ep_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ep_pci.c,v 1.31 2014/12/22 02:28:52 tedu Exp $ */ +/* $OpenBSD: if_ep_pci.c,v 1.32 2015/03/14 03:38:48 jsg Exp $ */ /* $NetBSD: if_ep_pci.c,v 1.13 1996/10/21 22:56:38 thorpej Exp $ */ /* @@ -60,7 +60,6 @@ #include <machine/bus.h> #include <machine/intr.h> -#include <dev/mii/mii.h> #include <dev/mii/miivar.h> #include <dev/ic/elink3var.h> diff --git a/sys/dev/pci/if_et.c b/sys/dev/pci/if_et.c index 1d8df6fc4c4..eb4ffcc7929 100644 --- a/sys/dev/pci/if_et.c +++ b/sys/dev/pci/if_et.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_et.c,v 1.25 2014/12/22 02:28:52 tedu Exp $ */ +/* $OpenBSD: if_et.c,v 1.26 2015/03/14 03:38:48 jsg Exp $ */ /* * Copyright (c) 2007 The DragonFly Project. All rights reserved. * @@ -64,7 +64,6 @@ #endif #include <net/if_vlan_var.h> -#include <dev/mii/mii.h> #include <dev/mii/miivar.h> #include <dev/pci/pcireg.h> diff --git a/sys/dev/pci/if_gem_pci.c b/sys/dev/pci/if_gem_pci.c index c01a1a3c2c9..bc24adbddad 100644 --- a/sys/dev/pci/if_gem_pci.c +++ b/sys/dev/pci/if_gem_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_gem_pci.c,v 1.36 2014/12/22 02:28:52 tedu Exp $ */ +/* $OpenBSD: if_gem_pci.c,v 1.37 2015/03/14 03:38:48 jsg Exp $ */ /* $NetBSD: if_gem_pci.c,v 1.1 2001/09/16 00:11:42 eeh Exp $ */ /* @@ -57,7 +57,6 @@ #include <dev/ofw/openfirm.h> #endif -#include <dev/mii/mii.h> #include <dev/mii/miivar.h> #include <dev/mii/mii_bitbang.h> diff --git a/sys/dev/pci/if_hme_pci.c b/sys/dev/pci/if_hme_pci.c index d9525ea3842..53bad42ba4f 100644 --- a/sys/dev/pci/if_hme_pci.c +++ b/sys/dev/pci/if_hme_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_hme_pci.c,v 1.19 2014/12/22 02:28:52 tedu Exp $ */ +/* $OpenBSD: if_hme_pci.c,v 1.20 2015/03/14 03:38:48 jsg Exp $ */ /* $NetBSD: if_hme_pci.c,v 1.3 2000/12/28 22:59:13 sommerfeld Exp $ */ /* @@ -47,7 +47,6 @@ #include <netinet/in.h> #include <netinet/if_ether.h> -#include <dev/mii/mii.h> #include <dev/mii/miivar.h> #ifdef __sparc64__ diff --git a/sys/dev/pci/if_iwi.c b/sys/dev/pci/if_iwi.c index 303c53ad4ca..c9808fd4add 100644 --- a/sys/dev/pci/if_iwi.c +++ b/sys/dev/pci/if_iwi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwi.c,v 1.123 2015/02/10 23:25:46 mpi Exp $ */ +/* $OpenBSD: if_iwi.c,v 1.124 2015/03/14 03:38:48 jsg Exp $ */ /*- * Copyright (c) 2004-2008 @@ -56,8 +56,6 @@ #include <net80211/ieee80211_var.h> #include <net80211/ieee80211_radiotap.h> -#include <crypto/arc4.h> - #include <dev/pci/if_iwireg.h> #include <dev/pci/if_iwivar.h> diff --git a/sys/dev/pci/if_iwn.c b/sys/dev/pci/if_iwn.c index ce16e335b8c..791a8657c6a 100644 --- a/sys/dev/pci/if_iwn.c +++ b/sys/dev/pci/if_iwn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwn.c,v 1.140 2015/02/10 23:25:46 mpi Exp $ */ +/* $OpenBSD: if_iwn.c,v 1.141 2015/03/14 03:38:48 jsg Exp $ */ /*- * Copyright (c) 2007-2010 Damien Bergamini <damien.bergamini@free.fr> @@ -46,7 +46,6 @@ #include <net/bpf.h> #endif #include <net/if.h> -#include <net/if_arp.h> #include <net/if_dl.h> #include <net/if_media.h> #include <net/if_types.h> diff --git a/sys/dev/pci/if_jme.c b/sys/dev/pci/if_jme.c index d84d9f321cc..9d90d4b1f05 100644 --- a/sys/dev/pci/if_jme.c +++ b/sys/dev/pci/if_jme.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_jme.c,v 1.37 2014/12/22 02:28:52 tedu Exp $ */ +/* $OpenBSD: if_jme.c,v 1.38 2015/03/14 03:38:48 jsg Exp $ */ /*- * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org> * All rights reserved. @@ -60,7 +60,6 @@ #include <net/bpf.h> #endif -#include <dev/mii/mii.h> #include <dev/mii/miivar.h> #include <dev/mii/jmphyreg.h> diff --git a/sys/dev/pci/if_lii.c b/sys/dev/pci/if_lii.c index c1af55c6b24..121fa26f6fb 100644 --- a/sys/dev/pci/if_lii.c +++ b/sys/dev/pci/if_lii.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_lii.c,v 1.34 2014/12/22 02:28:52 tedu Exp $ */ +/* $OpenBSD: if_lii.c,v 1.35 2015/03/14 03:38:48 jsg Exp $ */ /* * Copyright (c) 2007 The NetBSD Foundation. @@ -56,7 +56,6 @@ #include <netinet/in.h> #include <netinet/if_ether.h> -#include <dev/mii/mii.h> #include <dev/mii/miivar.h> #include <dev/pci/pcireg.h> diff --git a/sys/dev/pci/if_lmc.c b/sys/dev/pci/if_lmc.c index 0248e653e9d..791e67dd54b 100644 --- a/sys/dev/pci/if_lmc.c +++ b/sys/dev/pci/if_lmc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_lmc.c,v 1.28 2015/02/27 05:10:46 dlg Exp $ */ +/* $OpenBSD: if_lmc.c,v 1.29 2015/03/14 03:38:48 jsg Exp $ */ /* $NetBSD: if_lmc.c,v 1.1 1999/03/25 03:32:43 explorer Exp $ */ /*- @@ -91,8 +91,6 @@ #include <sys/kernel.h> #include <sys/device.h> -#include <dev/pci/pcidevs.h> - #include <net/if.h> #include <net/if_var.h> #include <net/if_types.h> diff --git a/sys/dev/pci/if_lmc_common.c b/sys/dev/pci/if_lmc_common.c index 4a726b07511..46680b3b26f 100644 --- a/sys/dev/pci/if_lmc_common.c +++ b/sys/dev/pci/if_lmc_common.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_lmc_common.c,v 1.14 2014/12/05 15:50:04 mpi Exp $ */ +/* $OpenBSD: if_lmc_common.c,v 1.15 2015/03/14 03:38:48 jsg Exp $ */ /* $NetBSD: if_lmc_common.c,v 1.1 1999/03/25 03:32:43 explorer Exp $ */ /*- @@ -75,8 +75,6 @@ #include <sys/kernel.h> #include <sys/device.h> -#include <dev/pci/pcidevs.h> - #include <net/if.h> #include <net/if_var.h> #include <net/if_types.h> diff --git a/sys/dev/pci/if_lmc_media.c b/sys/dev/pci/if_lmc_media.c index 459a1d14819..c091f0381fa 100644 --- a/sys/dev/pci/if_lmc_media.c +++ b/sys/dev/pci/if_lmc_media.c @@ -1,5 +1,5 @@ -/* $OpenBSD: if_lmc_media.c,v 1.18 2014/12/05 15:50:04 mpi Exp $ */ -/* $Id: if_lmc_media.c,v 1.18 2014/12/05 15:50:04 mpi Exp $ */ +/* $OpenBSD: if_lmc_media.c,v 1.19 2015/03/14 03:38:48 jsg Exp $ */ +/* $Id: if_lmc_media.c,v 1.19 2015/03/14 03:38:48 jsg Exp $ */ /*- * Copyright (c) 1997-1999 LAN Media Corporation (LMC) @@ -69,7 +69,6 @@ #include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> -#include <dev/ic/dc21040reg.h> #include <dev/pci/if_lmc_types.h> #include <dev/pci/if_lmcioctl.h> diff --git a/sys/dev/pci/if_lmc_obsd.c b/sys/dev/pci/if_lmc_obsd.c index d4738f19282..aa1e1c9aac3 100644 --- a/sys/dev/pci/if_lmc_obsd.c +++ b/sys/dev/pci/if_lmc_obsd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_lmc_obsd.c,v 1.24 2014/12/05 15:50:04 mpi Exp $ */ +/* $OpenBSD: if_lmc_obsd.c,v 1.25 2015/03/14 03:38:48 jsg Exp $ */ /* $NetBSD: if_lmc_nbsd.c,v 1.1 1999/03/25 03:32:43 explorer Exp $ */ /*- @@ -62,9 +62,6 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - -#include "bpfilter.h" - #include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> @@ -83,10 +80,6 @@ #include <net/if_dl.h> #include <net/netisr.h> -#if NBPFILTER > 0 -#include <net/bpf.h> -#endif - #include <net/if_sppp.h> #include <machine/bus.h> diff --git a/sys/dev/pci/if_malo_pci.c b/sys/dev/pci/if_malo_pci.c index 2a05817f6af..8558ab7b516 100644 --- a/sys/dev/pci/if_malo_pci.c +++ b/sys/dev/pci/if_malo_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_malo_pci.c,v 1.8 2013/12/06 21:03:04 deraadt Exp $ */ +/* $OpenBSD: if_malo_pci.c,v 1.9 2015/03/14 03:38:48 jsg Exp $ */ /* * Copyright (c) 2006 Marcus Glocker <mglocker@openbsd.org> @@ -33,7 +33,6 @@ #include <sys/device.h> #include <machine/bus.h> -#include <machine/intr.h> #include <net/if.h> #include <net/if_dl.h> diff --git a/sys/dev/pci/if_msk.c b/sys/dev/pci/if_msk.c index 8b50516ecb3..0b6866ca683 100644 --- a/sys/dev/pci/if_msk.c +++ b/sys/dev/pci/if_msk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_msk.c,v 1.112 2014/12/22 02:28:52 tedu Exp $ */ +/* $OpenBSD: if_msk.c,v 1.113 2015/03/14 03:38:48 jsg Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -115,7 +115,6 @@ #include <dev/mii/mii.h> #include <dev/mii/miivar.h> -#include <dev/mii/brgphyreg.h> #include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> diff --git a/sys/dev/pci/if_myx.c b/sys/dev/pci/if_myx.c index c95a41310bf..f7b1bbe6f0d 100644 --- a/sys/dev/pci/if_myx.c +++ b/sys/dev/pci/if_myx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_myx.c,v 1.75 2015/02/20 23:24:30 chris Exp $ */ +/* $OpenBSD: if_myx.c,v 1.76 2015/03/14 03:38:48 jsg Exp $ */ /* * Copyright (c) 2007 Reyk Floeter <reyk@openbsd.org> @@ -41,7 +41,6 @@ #include <net/if.h> #include <net/if_dl.h> #include <net/if_media.h> -#include <net/if_types.h> #if NBPFILTER > 0 #include <net/bpf.h> diff --git a/sys/dev/pci/if_nfe.c b/sys/dev/pci/if_nfe.c index 12af20ab77d..269654a03bc 100644 --- a/sys/dev/pci/if_nfe.c +++ b/sys/dev/pci/if_nfe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_nfe.c,v 1.108 2014/12/22 02:28:52 tedu Exp $ */ +/* $OpenBSD: if_nfe.c,v 1.109 2015/03/14 03:38:48 jsg Exp $ */ /*- * Copyright (c) 2006, 2007 Damien Bergamini <damien.bergamini@free.fr> @@ -52,7 +52,6 @@ #include <net/bpf.h> #endif -#include <dev/mii/mii.h> #include <dev/mii/miivar.h> #include <dev/pci/pcireg.h> diff --git a/sys/dev/pci/if_oce.c b/sys/dev/pci/if_oce.c index fd629bc41af..6e6f7937534 100644 --- a/sys/dev/pci/if_oce.c +++ b/sys/dev/pci/if_oce.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_oce.c,v 1.81 2014/12/22 02:28:52 tedu Exp $ */ +/* $OpenBSD: if_oce.c,v 1.82 2015/03/14 03:38:48 jsg Exp $ */ /* * Copyright (c) 2012 Mike Belopuhov @@ -70,7 +70,6 @@ #include <sys/pool.h> #include <net/if.h> -#include <net/if_dl.h> #include <net/if_media.h> #include <netinet/in.h> diff --git a/sys/dev/pci/if_pcn.c b/sys/dev/pci/if_pcn.c index 954b3b3e53c..de5cb87dd8a 100644 --- a/sys/dev/pci/if_pcn.c +++ b/sys/dev/pci/if_pcn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pcn.c,v 1.35 2015/02/09 03:09:57 dlg Exp $ */ +/* $OpenBSD: if_pcn.c,v 1.36 2015/03/14 03:38:48 jsg Exp $ */ /* $NetBSD: if_pcn.c,v 1.26 2005/05/07 09:15:44 is Exp $ */ /* @@ -95,7 +95,6 @@ #include <machine/bus.h> #include <machine/intr.h> -#include <dev/mii/mii.h> #include <dev/mii/miivar.h> #include <dev/ic/am79900reg.h> diff --git a/sys/dev/pci/if_pgt_pci.c b/sys/dev/pci/if_pgt_pci.c index 4ae6ad23a9c..fc31a3dcab6 100644 --- a/sys/dev/pci/if_pgt_pci.c +++ b/sys/dev/pci/if_pgt_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pgt_pci.c,v 1.15 2013/12/06 21:03:04 deraadt Exp $ */ +/* $OpenBSD: if_pgt_pci.c,v 1.16 2015/03/14 03:38:48 jsg Exp $ */ /* * Copyright (c) 2006 Marcus Glocker <mglocker@openbsd.org> @@ -33,7 +33,6 @@ #include <sys/device.h> #include <machine/bus.h> -#include <machine/intr.h> #include <net/if.h> #include <net/if_dl.h> diff --git a/sys/dev/pci/if_re_pci.c b/sys/dev/pci/if_re_pci.c index a5efdf2ba61..f82426c9f25 100644 --- a/sys/dev/pci/if_re_pci.c +++ b/sys/dev/pci/if_re_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_re_pci.c,v 1.47 2015/03/08 01:54:04 tobiasu Exp $ */ +/* $OpenBSD: if_re_pci.c,v 1.48 2015/03/14 03:38:48 jsg Exp $ */ /* * Copyright (c) 2005 Peter Valchev <pvalchev@openbsd.org> @@ -38,7 +38,6 @@ #include <netinet/in.h> #include <netinet/if_ether.h> -#include <dev/mii/mii.h> #include <dev/mii/miivar.h> #include <dev/pci/pcireg.h> diff --git a/sys/dev/pci/if_rl_pci.c b/sys/dev/pci/if_rl_pci.c index 67433e07346..58470553274 100644 --- a/sys/dev/pci/if_rl_pci.c +++ b/sys/dev/pci/if_rl_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_rl_pci.c,v 1.30 2014/12/22 02:28:52 tedu Exp $ */ +/* $OpenBSD: if_rl_pci.c,v 1.31 2015/03/14 03:38:48 jsg Exp $ */ /* * Copyright (c) 1997, 1998 @@ -59,7 +59,6 @@ #include <machine/bus.h> -#include <dev/mii/mii.h> #include <dev/mii/miivar.h> #include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> diff --git a/sys/dev/pci/if_san_obsd.c b/sys/dev/pci/if_san_obsd.c index 2ffbf999041..e9de78cd211 100644 --- a/sys/dev/pci/if_san_obsd.c +++ b/sys/dev/pci/if_san_obsd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_san_obsd.c,v 1.17 2014/12/05 15:50:04 mpi Exp $ */ +/* $OpenBSD: if_san_obsd.c,v 1.18 2015/03/14 03:38:48 jsg Exp $ */ /*- * Copyright (c) 2001-2004 Sangoma Technologies (SAN) @@ -56,7 +56,6 @@ #include <net/if.h> #include <net/if_var.h> #include <net/if_media.h> -#include <netinet/in.h> #include <net/if_sppp.h> #include <netinet/udp.h> diff --git a/sys/dev/pci/if_san_xilinx.c b/sys/dev/pci/if_san_xilinx.c index 2ae182575b7..b30ab5131e8 100644 --- a/sys/dev/pci/if_san_xilinx.c +++ b/sys/dev/pci/if_san_xilinx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_san_xilinx.c,v 1.32 2014/12/05 15:50:04 mpi Exp $ */ +/* $OpenBSD: if_san_xilinx.c,v 1.33 2015/03/14 03:38:48 jsg Exp $ */ /*- * Copyright (c) 2001-2004 Sangoma Technologies (SAN) @@ -46,7 +46,6 @@ #include <sys/time.h> #include <sys/timeout.h> -#include <net/bpf.h> #include <net/if.h> #include <net/if_var.h> #include <net/if_media.h> diff --git a/sys/dev/pci/if_se.c b/sys/dev/pci/if_se.c index e9aedc11e4a..bd1e51e396a 100644 --- a/sys/dev/pci/if_se.c +++ b/sys/dev/pci/if_se.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_se.c,v 1.10 2014/12/22 02:28:52 tedu Exp $ */ +/* $OpenBSD: if_se.c,v 1.11 2015/03/14 03:38:48 jsg Exp $ */ /*- * Copyright (c) 2009, 2010 Christopher Zimmermann <madroach@zakweb.de> @@ -75,7 +75,6 @@ #include <net/bpf.h> #endif -#include <dev/mii/mii.h> #include <dev/mii/miivar.h> #include <dev/pci/pcidevs.h> diff --git a/sys/dev/pci/if_sis.c b/sys/dev/pci/if_sis.c index 8e1b70d84ad..d4f4e62060f 100644 --- a/sys/dev/pci/if_sis.c +++ b/sys/dev/pci/if_sis.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sis.c,v 1.123 2015/02/11 21:36:02 brad Exp $ */ +/* $OpenBSD: if_sis.c,v 1.124 2015/03/14 03:38:48 jsg Exp $ */ /* * Copyright (c) 1997, 1998, 1999 * Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved. @@ -86,7 +86,6 @@ #include <sys/device.h> -#include <dev/mii/mii.h> #include <dev/mii/miivar.h> #include <dev/pci/pcireg.h> diff --git a/sys/dev/pci/if_sk.c b/sys/dev/pci/if_sk.c index 0eaa685df16..321bbd7e277 100644 --- a/sys/dev/pci/if_sk.c +++ b/sys/dev/pci/if_sk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sk.c,v 1.173 2014/12/22 02:28:52 tedu Exp $ */ +/* $OpenBSD: if_sk.c,v 1.174 2015/03/14 03:38:48 jsg Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -113,7 +113,6 @@ #include <net/bpf.h> #endif -#include <dev/mii/mii.h> #include <dev/mii/miivar.h> #include <dev/mii/brgphyreg.h> diff --git a/sys/dev/pci/if_stge.c b/sys/dev/pci/if_stge.c index 8d19263be1b..d9bec728bcd 100644 --- a/sys/dev/pci/if_stge.c +++ b/sys/dev/pci/if_stge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_stge.c,v 1.58 2014/12/22 02:28:52 tedu Exp $ */ +/* $OpenBSD: if_stge.c,v 1.59 2015/03/14 03:38:48 jsg Exp $ */ /* $NetBSD: if_stge.c,v 1.27 2005/05/16 21:35:32 bouyer Exp $ */ /*- @@ -70,7 +70,6 @@ #include <machine/bus.h> #include <machine/intr.h> -#include <dev/mii/mii.h> #include <dev/mii/miivar.h> #include <dev/mii/mii_bitbang.h> diff --git a/sys/dev/pci/if_tht.c b/sys/dev/pci/if_tht.c index f6342d661e0..71f533c8411 100644 --- a/sys/dev/pci/if_tht.c +++ b/sys/dev/pci/if_tht.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_tht.c,v 1.129 2014/12/22 02:28:52 tedu Exp $ */ +/* $OpenBSD: if_tht.c,v 1.130 2015/03/14 03:38:48 jsg Exp $ */ /* * Copyright (c) 2007 David Gwynne <dlg@openbsd.org> @@ -46,7 +46,6 @@ #include <dev/pci/pcidevs.h> #include <net/if.h> -#include <net/if_dl.h> #include <net/if_media.h> #include <net/if_types.h> diff --git a/sys/dev/pci/if_txp.c b/sys/dev/pci/if_txp.c index 73b95bd44a7..1daf695eaed 100644 --- a/sys/dev/pci/if_txp.c +++ b/sys/dev/pci/if_txp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_txp.c,v 1.113 2014/12/22 02:28:52 tedu Exp $ */ +/* $OpenBSD: if_txp.c,v 1.114 2015/03/14 03:38:48 jsg Exp $ */ /* * Copyright (c) 2001 @@ -64,7 +64,6 @@ #include <machine/bus.h> #include <dev/mii/mii.h> -#include <dev/mii/miivar.h> #include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> #include <dev/pci/pcidevs.h> diff --git a/sys/dev/pci/if_vge.c b/sys/dev/pci/if_vge.c index 1d15c3a03b5..e4f0ee6c2b6 100644 --- a/sys/dev/pci/if_vge.c +++ b/sys/dev/pci/if_vge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vge.c,v 1.59 2014/12/22 02:28:52 tedu Exp $ */ +/* $OpenBSD: if_vge.c,v 1.60 2015/03/14 03:38:48 jsg Exp $ */ /* $FreeBSD: if_vge.c,v 1.3 2004/09/11 22:13:25 wpaul Exp $ */ /* * Copyright (c) 2004 @@ -111,7 +111,6 @@ #include <net/bpf.h> #endif -#include <dev/mii/mii.h> #include <dev/mii/miivar.h> #include <dev/pci/pcireg.h> diff --git a/sys/dev/pci/if_vic.c b/sys/dev/pci/if_vic.c index bbec00f7198..88f30598fd4 100644 --- a/sys/dev/pci/if_vic.c +++ b/sys/dev/pci/if_vic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vic.c,v 1.85 2015/02/10 23:22:39 brad Exp $ */ +/* $OpenBSD: if_vic.c,v 1.86 2015/03/14 03:38:48 jsg Exp $ */ /* * Copyright (c) 2006 Reyk Floeter <reyk@openbsd.org> @@ -37,7 +37,6 @@ #include <machine/intr.h> #include <net/if.h> -#include <net/if_dl.h> #include <net/if_media.h> #include <net/if_types.h> diff --git a/sys/dev/pci/if_vio.c b/sys/dev/pci/if_vio.c index 68ffb3ff794..56a6e54f171 100644 --- a/sys/dev/pci/if_vio.c +++ b/sys/dev/pci/if_vio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vio.c,v 1.24 2015/02/09 03:09:57 dlg Exp $ */ +/* $OpenBSD: if_vio.c,v 1.25 2015/03/14 03:38:48 jsg Exp $ */ /* * Copyright (c) 2012 Stefan Fritsch, Alexander Fiveg. @@ -37,7 +37,6 @@ #include <sys/sockio.h> #include <sys/timeout.h> -#include <dev/pci/pcidevs.h> #include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> #include <dev/pci/virtioreg.h> diff --git a/sys/dev/pci/if_vmx.c b/sys/dev/pci/if_vmx.c index 0d0c065bc12..925a9775444 100644 --- a/sys/dev/pci/if_vmx.c +++ b/sys/dev/pci/if_vmx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vmx.c,v 1.24 2015/02/10 02:57:32 pelikan Exp $ */ +/* $OpenBSD: if_vmx.c,v 1.25 2015/03/14 03:38:48 jsg Exp $ */ /* * Copyright (c) 2013 Tsubai Masanari @@ -44,7 +44,6 @@ #include <dev/pci/if_vmxreg.h> #include <dev/pci/pcivar.h> -#include <dev/pci/pcireg.h> #include <dev/pci/pcidevs.h> #define NRXQUEUE 1 diff --git a/sys/dev/pci/if_vr.c b/sys/dev/pci/if_vr.c index a4a7d2bfdfe..3a35b322d80 100644 --- a/sys/dev/pci/if_vr.c +++ b/sys/dev/pci/if_vr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vr.c,v 1.138 2015/03/13 15:58:22 jasper Exp $ */ +/* $OpenBSD: if_vr.c,v 1.139 2015/03/14 03:38:48 jsg Exp $ */ /* * Copyright (c) 1997, 1998 @@ -90,7 +90,6 @@ #include <machine/bus.h> -#include <dev/mii/mii.h> #include <dev/mii/miivar.h> #include <dev/pci/pcireg.h> diff --git a/sys/dev/pci/if_wpi.c b/sys/dev/pci/if_wpi.c index 8ece21e9873..0453728fcef 100644 --- a/sys/dev/pci/if_wpi.c +++ b/sys/dev/pci/if_wpi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wpi.c,v 1.124 2015/02/10 23:25:46 mpi Exp $ */ +/* $OpenBSD: if_wpi.c,v 1.125 2015/03/14 03:38:48 jsg Exp $ */ /*- * Copyright (c) 2006-2008 @@ -46,7 +46,6 @@ #include <net/bpf.h> #endif #include <net/if.h> -#include <net/if_arp.h> #include <net/if_dl.h> #include <net/if_media.h> #include <net/if_types.h> diff --git a/sys/dev/pci/if_xge.c b/sys/dev/pci/if_xge.c index 8fab753b527..6d9310c29f2 100644 --- a/sys/dev/pci/if_xge.c +++ b/sys/dev/pci/if_xge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_xge.c,v 1.59 2014/12/22 02:28:52 tedu Exp $ */ +/* $OpenBSD: if_xge.c,v 1.60 2015/03/14 03:38:48 jsg Exp $ */ /* $NetBSD: if_xge.c,v 1.1 2005/09/09 10:30:27 ragge Exp $ */ /* @@ -71,7 +71,6 @@ #include <machine/bus.h> #include <machine/intr.h> -#include <dev/mii/mii.h> #include <dev/mii/miivar.h> #include <dev/pci/pcivar.h> diff --git a/sys/dev/pci/if_xl_pci.c b/sys/dev/pci/if_xl_pci.c index 16a3068aae8..c61faafe76f 100644 --- a/sys/dev/pci/if_xl_pci.c +++ b/sys/dev/pci/if_xl_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_xl_pci.c,v 1.43 2014/12/22 02:28:52 tedu Exp $ */ +/* $OpenBSD: if_xl_pci.c,v 1.44 2015/03/14 03:38:48 jsg Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -55,7 +55,6 @@ #include <netinet/in.h> #include <netinet/if_ether.h> -#include <dev/mii/mii.h> #include <dev/mii/miivar.h> #include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> diff --git a/sys/dev/pci/ips.c b/sys/dev/pci/ips.c index 83c62d8a346..2baa182640b 100644 --- a/sys/dev/pci/ips.c +++ b/sys/dev/pci/ips.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ips.c,v 1.110 2014/07/13 23:10:23 deraadt Exp $ */ +/* $OpenBSD: ips.c,v 1.111 2015/03/14 03:38:48 jsg Exp $ */ /* * Copyright (c) 2006, 2007, 2009 Alexander Yurchenko <grange@openbsd.org> @@ -24,7 +24,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/buf.h> #include <sys/device.h> #include <sys/ioctl.h> #include <sys/kernel.h> diff --git a/sys/dev/pci/ixgb_ee.c b/sys/dev/pci/ixgb_ee.c index 6641484d0ab..ed3026eef20 100644 --- a/sys/dev/pci/ixgb_ee.c +++ b/sys/dev/pci/ixgb_ee.c @@ -31,7 +31,7 @@ *******************************************************************************/ -/* $OpenBSD: ixgb_ee.c,v 1.5 2014/12/22 02:28:52 tedu Exp $ */ +/* $OpenBSD: ixgb_ee.c,v 1.6 2015/03/14 03:38:48 jsg Exp $ */ #include <sys/param.h> #include <sys/systm.h> @@ -53,7 +53,6 @@ #include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> -#include <dev/pci/pcidevs.h> #include <dev/pci/ixgb_hw.h> #include <dev/pci/ixgb_ee.h> diff --git a/sys/dev/pci/ixgb_hw.c b/sys/dev/pci/ixgb_hw.c index 96848563a03..bb1a17a5c7a 100644 --- a/sys/dev/pci/ixgb_hw.c +++ b/sys/dev/pci/ixgb_hw.c @@ -31,7 +31,7 @@ *******************************************************************************/ -/* $OpenBSD: ixgb_hw.c,v 1.6 2014/12/22 02:28:52 tedu Exp $ */ +/* $OpenBSD: ixgb_hw.c,v 1.7 2015/03/14 03:38:48 jsg Exp $ */ /* ixgb_hw.c * Shared functions for accessing and configuring the adapter @@ -57,7 +57,6 @@ #include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> -#include <dev/pci/pcidevs.h> #include <dev/pci/ixgb_hw.h> #include <dev/pci/ixgb_ids.h> diff --git a/sys/dev/pci/jmb.c b/sys/dev/pci/jmb.c index e87de0ed12a..6e4d5d7b879 100644 --- a/sys/dev/pci/jmb.c +++ b/sys/dev/pci/jmb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: jmb.c,v 1.8 2010/04/08 00:23:53 tedu Exp $ */ +/* $OpenBSD: jmb.c,v 1.9 2015/03/14 03:38:48 jsg Exp $ */ /* * Copyright (c) 2007 David Gwynne <dlg@openbsd.org> @@ -24,8 +24,6 @@ #include <sys/device.h> #include <sys/queue.h> -#include <machine/bus.h> - #include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> #include <dev/pci/pcidevs.h> diff --git a/sys/dev/pci/kate.c b/sys/dev/pci/kate.c index c99e842c0f9..52c1b2e15ee 100644 --- a/sys/dev/pci/kate.c +++ b/sys/dev/pci/kate.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kate.c,v 1.5 2009/01/26 15:07:49 kettenis Exp $ */ +/* $OpenBSD: kate.c,v 1.6 2015/03/14 03:38:48 jsg Exp $ */ /* * Copyright (c) 2008 Constantine A. Murenin <cnst+openbsd@bugmail.mojo.ru> @@ -21,8 +21,6 @@ #include <sys/device.h> #include <sys/sensors.h> -#include <machine/bus.h> - #include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> #include <dev/pci/pcidevs.h> diff --git a/sys/dev/pci/km.c b/sys/dev/pci/km.c index 6355a2d54d1..663986080c3 100644 --- a/sys/dev/pci/km.c +++ b/sys/dev/pci/km.c @@ -1,4 +1,4 @@ -/* $OpenBSD: km.c,v 1.9 2014/12/06 03:52:50 jsg Exp $ */ +/* $OpenBSD: km.c,v 1.10 2015/03/14 03:38:48 jsg Exp $ */ /* * Copyright (c) 2008 Constantine A. Murenin <cnst+openbsd@bugmail.mojo.ru> @@ -23,7 +23,6 @@ #include <machine/bus.h> -#include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> #include <dev/pci/pcidevs.h> diff --git a/sys/dev/pci/mfii.c b/sys/dev/pci/mfii.c index 153d6c50ba4..ff74525e75f 100644 --- a/sys/dev/pci/mfii.c +++ b/sys/dev/pci/mfii.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mfii.c,v 1.24 2015/01/09 03:34:40 dlg Exp $ */ +/* $OpenBSD: mfii.c,v 1.25 2015/03/14 03:38:48 jsg Exp $ */ /* * Copyright (c) 2012 David Gwynne <dlg@openbsd.org> @@ -20,7 +20,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/malloc.h> #include <sys/device.h> #include <sys/types.h> diff --git a/sys/dev/pci/mpii.c b/sys/dev/pci/mpii.c index fa0376a96e1..7d8867f813b 100644 --- a/sys/dev/pci/mpii.c +++ b/sys/dev/pci/mpii.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpii.c,v 1.99 2015/03/02 11:55:52 sthen Exp $ */ +/* $OpenBSD: mpii.c,v 1.100 2015/03/14 03:38:48 jsg Exp $ */ /* * Copyright (c) 2010, 2012 Mike Belopuhov * Copyright (c) 2009 James Giannoules @@ -22,7 +22,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/buf.h> #include <sys/device.h> #include <sys/ioctl.h> #include <sys/malloc.h> diff --git a/sys/dev/pci/nviic.c b/sys/dev/pci/nviic.c index 85af148be85..590bc176432 100644 --- a/sys/dev/pci/nviic.c +++ b/sys/dev/pci/nviic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nviic.c,v 1.16 2012/03/15 14:21:50 sthen Exp $ */ +/* $OpenBSD: nviic.c,v 1.17 2015/03/14 03:38:48 jsg Exp $ */ /* * Copyright (c) 2005 David Gwynne <dlg@openbsd.org> @@ -19,7 +19,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/device.h> -#include <sys/kernel.h> #include <sys/rwlock.h> #include <machine/bus.h> diff --git a/sys/dev/pci/pccbb.c b/sys/dev/pci/pccbb.c index 5b50113818c..7714b1de605 100644 --- a/sys/dev/pci/pccbb.c +++ b/sys/dev/pci/pccbb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pccbb.c,v 1.92 2014/07/12 18:48:52 tedu Exp $ */ +/* $OpenBSD: pccbb.c,v 1.93 2015/03/14 03:38:48 jsg Exp $ */ /* $NetBSD: pccbb.c,v 1.96 2004/03/28 09:49:31 nakayama Exp $ */ /* @@ -42,7 +42,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> -#include <sys/errno.h> #include <sys/evcount.h> #include <sys/ioctl.h> #include <sys/syslog.h> diff --git a/sys/dev/pci/pci_map.c b/sys/dev/pci/pci_map.c index f2478865345..30623134387 100644 --- a/sys/dev/pci/pci_map.c +++ b/sys/dev/pci/pci_map.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_map.c,v 1.30 2013/02/09 20:43:33 miod Exp $ */ +/* $OpenBSD: pci_map.c,v 1.31 2015/03/14 03:38:48 jsg Exp $ */ /* $NetBSD: pci_map.c,v 1.7 2000/05/10 16:58:42 thorpej Exp $ */ /*- @@ -36,7 +36,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/device.h> #include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> diff --git a/sys/dev/pci/pci_quirks.c b/sys/dev/pci/pci_quirks.c index 1e9d0a60ffe..e95b607fec4 100644 --- a/sys/dev/pci/pci_quirks.c +++ b/sys/dev/pci/pci_quirks.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_quirks.c,v 1.5 2007/07/02 07:19:54 dlg Exp $ */ +/* $OpenBSD: pci_quirks.c,v 1.6 2015/03/14 03:38:48 jsg Exp $ */ /* $NetBSD: pci_quirks.c,v 1.1 1998/05/31 06:03:44 cgd Exp $ */ /* @@ -36,7 +36,6 @@ */ #include <sys/param.h> -#include <sys/device.h> #include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c index bb8eff4ad4d..df220c02bbf 100644 --- a/sys/dev/pci/pciide.c +++ b/sys/dev/pci/pciide.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pciide.c,v 1.351 2015/01/09 07:29:45 jsg Exp $ */ +/* $OpenBSD: pciide.c,v 1.352 2015/03/14 03:38:48 jsg Exp $ */ /* $NetBSD: pciide.c,v 1.127 2001/08/03 01:31:08 tsutsui Exp $ */ /* @@ -118,7 +118,6 @@ int wdcdebug_pciide_mask = WDCDEBUG_PCIIDE_MASK; #include <dev/pci/pciide_acard_reg.h> #include <dev/pci/pciide_natsemi_reg.h> #include <dev/pci/pciide_nforce_reg.h> -#include <dev/pci/pciide_i31244_reg.h> #include <dev/pci/pciide_ite_reg.h> #include <dev/pci/pciide_ixp_reg.h> #include <dev/pci/pciide_svwsata_reg.h> diff --git a/sys/dev/pci/pcscp.c b/sys/dev/pci/pcscp.c index ccdc4855e4a..dd6f0378ec9 100644 --- a/sys/dev/pci/pcscp.c +++ b/sys/dev/pci/pcscp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pcscp.c,v 1.19 2014/01/18 22:33:59 dlg Exp $ */ +/* $OpenBSD: pcscp.c,v 1.20 2015/03/14 03:38:48 jsg Exp $ */ /* $NetBSD: pcscp.c,v 1.26 2003/10/19 10:25:42 tsutsui Exp $ */ /*- @@ -45,7 +45,6 @@ #include <sys/buf.h> #include <machine/bus.h> -#include <machine/intr.h> #include <scsi/scsi_all.h> #include <scsi/scsiconf.h> diff --git a/sys/dev/pci/ppb.c b/sys/dev/pci/ppb.c index 5ae17304e62..20d4ab34b6b 100644 --- a/sys/dev/pci/ppb.c +++ b/sys/dev/pci/ppb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ppb.c,v 1.61 2015/01/27 03:17:36 dlg Exp $ */ +/* $OpenBSD: ppb.c,v 1.62 2015/03/14 03:38:48 jsg Exp $ */ /* $NetBSD: ppb.c,v 1.16 1997/06/06 23:48:05 thorpej Exp $ */ /* @@ -33,7 +33,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/device.h> #include <sys/task.h> #include <sys/timeout.h> diff --git a/sys/dev/pci/puc.c b/sys/dev/pci/puc.c index ab845fb8562..ff65cafd26a 100644 --- a/sys/dev/pci/puc.c +++ b/sys/dev/pci/puc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: puc.c,v 1.23 2013/05/30 16:15:02 deraadt Exp $ */ +/* $OpenBSD: puc.c,v 1.24 2015/03/14 03:38:49 jsg Exp $ */ /* $NetBSD: puc.c,v 1.3 1999/02/06 06:29:54 cgd Exp $ */ /* @@ -62,8 +62,6 @@ #include <dev/pci/pcivar.h> #include <dev/pci/pucvar.h> -#include <dev/pci/pcidevs.h> - #include <dev/ic/comreg.h> #include <dev/ic/comvar.h> diff --git a/sys/dev/pci/pucdata.c b/sys/dev/pci/pucdata.c index 38f1d96fa90..feca60d7a91 100644 --- a/sys/dev/pci/pucdata.c +++ b/sys/dev/pci/pucdata.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pucdata.c,v 1.95 2014/12/07 03:59:25 deraadt Exp $ */ +/* $OpenBSD: pucdata.c,v 1.96 2015/03/14 03:38:49 jsg Exp $ */ /* $NetBSD: pucdata.c,v 1.6 1999/07/03 05:55:23 cgd Exp $ */ /* @@ -44,7 +44,6 @@ #include <dev/pci/pcivar.h> #include <dev/pci/pucvar.h> #include <dev/pci/pcidevs.h> -#include <dev/ic/comreg.h> const struct puc_device_description puc_devs[] = { diff --git a/sys/dev/pci/qle.c b/sys/dev/pci/qle.c index 71019cb03e1..47df25ef678 100644 --- a/sys/dev/pci/qle.c +++ b/sys/dev/pci/qle.c @@ -1,4 +1,4 @@ -/* $OpenBSD: qle.c,v 1.34 2015/02/09 03:15:41 dlg Exp $ */ +/* $OpenBSD: qle.c,v 1.35 2015/03/14 03:38:49 jsg Exp $ */ /* * Copyright (c) 2013, 2014 Jonathan Matthew <jmatthew@openbsd.org> @@ -20,7 +20,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/malloc.h> #include <sys/device.h> #include <sys/sensors.h> diff --git a/sys/dev/pci/rtsx_pci.c b/sys/dev/pci/rtsx_pci.c index d3054328254..dd0bb8c88d4 100644 --- a/sys/dev/pci/rtsx_pci.c +++ b/sys/dev/pci/rtsx_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtsx_pci.c,v 1.8 2015/02/23 20:40:47 phessler Exp $ */ +/* $OpenBSD: rtsx_pci.c,v 1.9 2015/03/14 03:38:49 jsg Exp $ */ /* * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org> @@ -20,7 +20,6 @@ #include <sys/param.h> #include <sys/device.h> #include <sys/systm.h> -#include <sys/malloc.h> #include <dev/pci/pcivar.h> #include <dev/pci/pcidevs.h> diff --git a/sys/dev/pci/safe.c b/sys/dev/pci/safe.c index fb7e647e0fe..271cb470a1f 100644 --- a/sys/dev/pci/safe.c +++ b/sys/dev/pci/safe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: safe.c,v 1.38 2014/08/15 15:43:27 mikeb Exp $ */ +/* $OpenBSD: safe.c,v 1.39 2015/03/14 03:38:49 jsg Exp $ */ /*- * Copyright (c) 2003 Sam Leffler, Errno Consulting @@ -36,7 +36,6 @@ #include <sys/systm.h> #include <sys/errno.h> #include <sys/malloc.h> -#include <sys/kernel.h> #include <sys/mbuf.h> #include <sys/device.h> #include <sys/timeout.h> diff --git a/sys/dev/pci/vga_pci.c b/sys/dev/pci/vga_pci.c index eb967560d15..f7445375e36 100644 --- a/sys/dev/pci/vga_pci.c +++ b/sys/dev/pci/vga_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vga_pci.c,v 1.82 2014/12/06 03:01:42 jsg Exp $ */ +/* $OpenBSD: vga_pci.c,v 1.83 2015/03/14 03:38:49 jsg Exp $ */ /* $NetBSD: vga_pci.c,v 1.3 1998/06/08 06:55:58 thorpej Exp $ */ /* @@ -81,8 +81,6 @@ #include <dev/pci/pcivar.h> #include <dev/pci/pcidevs.h> -#include <dev/pci/agpvar.h> - #include <dev/ic/mc6845reg.h> #include <dev/ic/pcdisplayvar.h> #include <dev/ic/vgareg.h> diff --git a/sys/dev/pci/vioblk.c b/sys/dev/pci/vioblk.c index 468e1f3c83d..d438736b8c5 100644 --- a/sys/dev/pci/vioblk.c +++ b/sys/dev/pci/vioblk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vioblk.c,v 1.6 2014/12/06 10:11:46 sf Exp $ */ +/* $OpenBSD: vioblk.c,v 1.7 2015/03/14 03:38:49 jsg Exp $ */ /* * Copyright (c) 2012 Stefan Fritsch. @@ -54,7 +54,6 @@ #include <sys/device.h> #include <sys/stat.h> #include <sys/buf.h> -#include <dev/pci/pcivar.h> #include <dev/pci/virtioreg.h> #include <dev/pci/virtiovar.h> #include <dev/pci/vioblkreg.h> diff --git a/sys/dev/pci/viomb.c b/sys/dev/pci/viomb.c index bb06915a17c..2d4e4f535f7 100644 --- a/sys/dev/pci/viomb.c +++ b/sys/dev/pci/viomb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: viomb.c,v 1.12 2015/02/09 03:15:41 dlg Exp $ */ +/* $OpenBSD: viomb.c,v 1.13 2015/03/14 03:38:49 jsg Exp $ */ /* $NetBSD: viomb.c,v 1.1 2011/10/30 12:12:21 hannken Exp $ */ /* @@ -37,7 +37,6 @@ #include <uvm/uvm_extern.h> -#include <dev/pci/pcidevs.h> #include <dev/pci/pcivar.h> #include <dev/pci/virtioreg.h> diff --git a/sys/dev/pci/viornd.c b/sys/dev/pci/viornd.c index 631db91701e..28cf1af9320 100644 --- a/sys/dev/pci/viornd.c +++ b/sys/dev/pci/viornd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: viornd.c,v 1.1 2014/01/21 21:14:58 sf Exp $ */ +/* $OpenBSD: viornd.c,v 1.2 2015/03/14 03:38:49 jsg Exp $ */ /* * Copyright (c) 2014 Stefan Fritsch <sf@sfritsch.de> @@ -24,7 +24,6 @@ #include <sys/device.h> #include <sys/pool.h> #include <dev/rndvar.h> -#include <dev/pci/pcivar.h> #include <dev/pci/virtioreg.h> #include <dev/pci/virtiovar.h> diff --git a/sys/dev/pci/vioscsi.c b/sys/dev/pci/vioscsi.c index 612f36959cc..5008c5c2724 100644 --- a/sys/dev/pci/vioscsi.c +++ b/sys/dev/pci/vioscsi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vioscsi.c,v 1.2 2013/12/22 10:49:40 sf Exp $ */ +/* $OpenBSD: vioscsi.c,v 1.3 2015/03/14 03:38:49 jsg Exp $ */ /* * Copyright (c) 2013 Google Inc. * @@ -23,7 +23,6 @@ #include <machine/bus.h> #include <machine/intr.h> -#include <dev/pci/pcidevs.h> #include <dev/pci/vioscsireg.h> #include <dev/pci/virtiovar.h> diff --git a/sys/dev/pci/virtio.c b/sys/dev/pci/virtio.c index fe9268fe4fa..e3cc227b605 100644 --- a/sys/dev/pci/virtio.c +++ b/sys/dev/pci/virtio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: virtio.c,v 1.12 2014/12/16 21:19:29 tedu Exp $ */ +/* $OpenBSD: virtio.c,v 1.13 2015/03/14 03:38:49 jsg Exp $ */ /* $NetBSD: virtio.c,v 1.3 2011/11/02 23:05:52 njoly Exp $ */ /* @@ -34,7 +34,6 @@ #include <sys/mutex.h> #include <sys/atomic.h> -#include <dev/pci/pcidevs.h> #include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> diff --git a/sys/dev/pci/virtio_pci.c b/sys/dev/pci/virtio_pci.c index 33d51ede3fc..4b496a1f941 100644 --- a/sys/dev/pci/virtio_pci.c +++ b/sys/dev/pci/virtio_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: virtio_pci.c,v 1.8 2014/12/15 20:15:48 brad Exp $ */ +/* $OpenBSD: virtio_pci.c,v 1.9 2015/03/14 03:38:49 jsg Exp $ */ /* $NetBSD: virtio.c,v 1.3 2011/11/02 23:05:52 njoly Exp $ */ /* @@ -29,7 +29,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/device.h> #include <sys/mutex.h> diff --git a/sys/dev/pci/vmwpvs.c b/sys/dev/pci/vmwpvs.c index 458ae5d0cc6..03110961fa6 100644 --- a/sys/dev/pci/vmwpvs.c +++ b/sys/dev/pci/vmwpvs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmwpvs.c,v 1.11 2015/01/27 03:17:36 dlg Exp $ */ +/* $OpenBSD: vmwpvs.c,v 1.12 2015/03/14 03:38:49 jsg Exp $ */ /* * Copyright (c) 2013 David Gwynne <dlg@openbsd.org> @@ -18,7 +18,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/buf.h> #include <sys/device.h> #include <sys/ioctl.h> #include <sys/malloc.h> diff --git a/sys/dev/pci/yds.c b/sys/dev/pci/yds.c index e235705cb82..fdb3aa991c8 100644 --- a/sys/dev/pci/yds.c +++ b/sys/dev/pci/yds.c @@ -1,4 +1,4 @@ -/* $OpenBSD: yds.c,v 1.48 2014/11/18 23:55:01 krw Exp $ */ +/* $OpenBSD: yds.c,v 1.49 2015/03/14 03:38:49 jsg Exp $ */ /* $NetBSD: yds.c,v 1.5 2001/05/21 23:55:04 minoura Exp $ */ /* @@ -57,7 +57,6 @@ #include <dev/mulaw.h> #include <dev/auconv.h> #include <dev/ic/ac97.h> -#include <dev/ic/mpuvar.h> #include <machine/bus.h> #include <machine/intr.h> diff --git a/sys/dev/pckbc/pckbd.c b/sys/dev/pckbc/pckbd.c index 66f036e7937..d6a8d848631 100644 --- a/sys/dev/pckbc/pckbd.c +++ b/sys/dev/pckbc/pckbd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pckbd.c,v 1.39 2015/03/12 20:28:26 deraadt Exp $ */ +/* $OpenBSD: pckbd.c,v 1.40 2015/03/14 03:38:49 jsg Exp $ */ /* $NetBSD: pckbd.c,v 1.24 2000/06/05 22:20:57 sommerfeld Exp $ */ /*- @@ -78,7 +78,6 @@ #include <dev/ic/pckbcvar.h> #include <dev/pckbc/pckbdreg.h> -#include <dev/pckbc/pckbdvar.h> #include <dev/pckbc/pmsreg.h> #include <dev/wscons/wsconsio.h> diff --git a/sys/dev/pcmcia/aic_pcmcia.c b/sys/dev/pcmcia/aic_pcmcia.c index dddf51a3887..11c1dd70b95 100644 --- a/sys/dev/pcmcia/aic_pcmcia.c +++ b/sys/dev/pcmcia/aic_pcmcia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aic_pcmcia.c,v 1.16 2011/03/31 13:05:27 jasper Exp $ */ +/* $OpenBSD: aic_pcmcia.c,v 1.17 2015/03/14 03:38:49 jsg Exp $ */ /* $NetBSD: aic_pcmcia.c,v 1.6 1998/07/19 17:28:15 christos Exp $ */ /* @@ -44,7 +44,6 @@ #include <dev/ic/aic6360var.h> -#include <dev/pcmcia/pcmciareg.h> #include <dev/pcmcia/pcmciavar.h> #include <dev/pcmcia/pcmciadevs.h> diff --git a/sys/dev/pcmcia/com_pcmcia.c b/sys/dev/pcmcia/com_pcmcia.c index 680b83583b5..86d93195c69 100644 --- a/sys/dev/pcmcia/com_pcmcia.c +++ b/sys/dev/pcmcia/com_pcmcia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: com_pcmcia.c,v 1.54 2014/09/14 14:17:25 jsg Exp $ */ +/* $OpenBSD: com_pcmcia.c,v 1.55 2015/03/14 03:38:49 jsg Exp $ */ /* $NetBSD: com_pcmcia.c,v 1.15 1998/08/22 17:47:58 msaitoh Exp $ */ /* @@ -102,7 +102,6 @@ #include <sys/device.h> #include <machine/intr.h> -#include <machine/bus.h> #include <dev/pcmcia/pcmciavar.h> #include <dev/pcmcia/pcmciareg.h> diff --git a/sys/dev/pcmcia/if_an_pcmcia.c b/sys/dev/pcmcia/if_an_pcmcia.c index bfedf0095d8..29c4198a7ec 100644 --- a/sys/dev/pcmcia/if_an_pcmcia.c +++ b/sys/dev/pcmcia/if_an_pcmcia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_an_pcmcia.c,v 1.23 2015/02/28 00:16:36 jsg Exp $ */ +/* $OpenBSD: if_an_pcmcia.c,v 1.24 2015/03/14 03:38:49 jsg Exp $ */ /* * Copyright (c) 1999 Michael Shalayeff @@ -44,8 +44,6 @@ #include <net80211/ieee80211_var.h> #include <net80211/ieee80211_radiotap.h> -#include <machine/bus.h> - #include <dev/pcmcia/pcmciareg.h> #include <dev/pcmcia/pcmciavar.h> #include <dev/pcmcia/pcmciadevs.h> diff --git a/sys/dev/pcmcia/if_cnw.c b/sys/dev/pcmcia/if_cnw.c index f1d749318d9..0f6019103b9 100644 --- a/sys/dev/pcmcia/if_cnw.c +++ b/sys/dev/pcmcia/if_cnw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_cnw.c,v 1.26 2014/12/22 02:28:52 tedu Exp $ */ +/* $OpenBSD: if_cnw.c,v 1.27 2015/03/14 03:38:49 jsg Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. * All rights reserved. @@ -61,7 +61,6 @@ #include <dev/pcmcia/if_cnwreg.h> -#include <dev/pcmcia/pcmciareg.h> #include <dev/pcmcia/pcmciavar.h> #include <dev/pcmcia/pcmciadevs.h> diff --git a/sys/dev/pcmcia/if_ep_pcmcia.c b/sys/dev/pcmcia/if_ep_pcmcia.c index 282bc713af8..c7c2ca0de20 100644 --- a/sys/dev/pcmcia/if_ep_pcmcia.c +++ b/sys/dev/pcmcia/if_ep_pcmcia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ep_pcmcia.c,v 1.44 2014/08/11 12:45:45 mpi Exp $ */ +/* $OpenBSD: if_ep_pcmcia.c,v 1.45 2015/03/14 03:38:49 jsg Exp $ */ /* $NetBSD: if_ep_pcmcia.c,v 1.16 1998/08/17 23:20:40 thorpej Exp $ */ /*- @@ -93,7 +93,6 @@ #include <dev/mii/miivar.h> #include <dev/ic/elink3var.h> -#include <dev/ic/elink3reg.h> #include <dev/pcmcia/pcmciareg.h> #include <dev/pcmcia/pcmciavar.h> diff --git a/sys/dev/pcmcia/if_malo.c b/sys/dev/pcmcia/if_malo.c index dd3b7ea58f5..aa4bec3b79a 100644 --- a/sys/dev/pcmcia/if_malo.c +++ b/sys/dev/pcmcia/if_malo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_malo.c,v 1.81 2014/12/22 02:28:52 tedu Exp $ */ +/* $OpenBSD: if_malo.c,v 1.82 2015/03/14 03:38:49 jsg Exp $ */ /* * Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org> @@ -47,7 +47,6 @@ #include <machine/bus.h> #include <machine/intr.h> -#include <dev/pcmcia/pcmciareg.h> #include <dev/pcmcia/pcmciavar.h> #include <dev/pcmcia/pcmciadevs.h> diff --git a/sys/dev/pcmcia/if_ne_pcmcia.c b/sys/dev/pcmcia/if_ne_pcmcia.c index c44dfa0f4a0..8a905573f77 100644 --- a/sys/dev/pcmcia/if_ne_pcmcia.c +++ b/sys/dev/pcmcia/if_ne_pcmcia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ne_pcmcia.c,v 1.97 2014/11/24 02:03:37 brad Exp $ */ +/* $OpenBSD: if_ne_pcmcia.c,v 1.98 2015/03/14 03:38:49 jsg Exp $ */ /* $NetBSD: if_ne_pcmcia.c,v 1.17 1998/08/15 19:00:04 thorpej Exp $ */ /* @@ -57,7 +57,6 @@ #include <dev/ic/ne2000reg.h> #include <dev/ic/ne2000var.h> -#include <dev/ic/dl10019reg.h> #include <dev/ic/dl10019var.h> #include <dev/ic/rtl80x9reg.h> diff --git a/sys/dev/pcmcia/if_sm_pcmcia.c b/sys/dev/pcmcia/if_sm_pcmcia.c index ed0adf135f1..e17934ec134 100644 --- a/sys/dev/pcmcia/if_sm_pcmcia.c +++ b/sys/dev/pcmcia/if_sm_pcmcia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sm_pcmcia.c,v 1.35 2014/12/03 20:09:32 krw Exp $ */ +/* $OpenBSD: if_sm_pcmcia.c,v 1.36 2015/03/14 03:38:49 jsg Exp $ */ /* $NetBSD: if_sm_pcmcia.c,v 1.11 1998/08/15 20:47:32 thorpej Exp $ */ /*- @@ -61,7 +61,6 @@ #include <dev/mii/mii.h> #include <dev/mii/miivar.h> -#include <dev/ic/smc91cxxreg.h> #include <dev/ic/smc91cxxvar.h> #include <dev/pcmcia/pcmciareg.h> diff --git a/sys/dev/pcmcia/if_xe.c b/sys/dev/pcmcia/if_xe.c index f8c5b0b9c86..d07b7398e7a 100644 --- a/sys/dev/pcmcia/if_xe.c +++ b/sys/dev/pcmcia/if_xe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_xe.c,v 1.46 2014/12/22 02:28:52 tedu Exp $ */ +/* $OpenBSD: if_xe.c,v 1.47 2015/03/14 03:38:49 jsg Exp $ */ /* * Copyright (c) 1999 Niklas Hallqvist, Brandon Creighton, Job de Haas @@ -57,7 +57,6 @@ #include <sys/syslog.h> #include <net/if.h> -#include <net/if_dl.h> #include <net/if_media.h> #include <net/if_types.h> diff --git a/sys/dev/pcmcia/pcmcia_cis_quirks.c b/sys/dev/pcmcia/pcmcia_cis_quirks.c index 5b26a362e7a..901dbbec67e 100644 --- a/sys/dev/pcmcia/pcmcia_cis_quirks.c +++ b/sys/dev/pcmcia/pcmcia_cis_quirks.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pcmcia_cis_quirks.c,v 1.11 2014/08/18 04:23:11 dlg Exp $ */ +/* $OpenBSD: pcmcia_cis_quirks.c,v 1.12 2015/03/14 03:38:49 jsg Exp $ */ /* $NetBSD: pcmcia_cis_quirks.c,v 1.3 1998/12/29 09:00:28 marc Exp $ */ /* @@ -38,7 +38,6 @@ #include <dev/pcmcia/pcmciadevs.h> #include <dev/pcmcia/pcmciareg.h> -#include <dev/pcmcia/pcmciachip.h> #include <dev/pcmcia/pcmciavar.h> /* There are cards out there whose CIS flat-out lies. This file diff --git a/sys/dev/puc/lpt_puc.c b/sys/dev/puc/lpt_puc.c index f59e8ae944b..6301c1825c8 100644 --- a/sys/dev/puc/lpt_puc.c +++ b/sys/dev/puc/lpt_puc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lpt_puc.c,v 1.7 2011/11/15 22:27:53 deraadt Exp $ */ +/* $OpenBSD: lpt_puc.c,v 1.8 2015/03/14 03:38:49 jsg Exp $ */ /* $NetBSD: lpt_puc.c,v 1.1 1998/06/26 18:52:41 cgd Exp $ */ /* @@ -46,7 +46,6 @@ #include <machine/bus.h> #include <dev/pci/pucvar.h> -#include <dev/ic/lptreg.h> #include <dev/ic/lptvar.h> int lpt_puc_probe(struct device *, void *, void *); diff --git a/sys/dev/rasops/rasops.c b/sys/dev/rasops/rasops.c index e0a59558d1d..917c35906db 100644 --- a/sys/dev/rasops/rasops.c +++ b/sys/dev/rasops/rasops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rasops.c,v 1.38 2015/01/27 03:17:36 dlg Exp $ */ +/* $OpenBSD: rasops.c,v 1.39 2015/03/14 03:38:49 jsg Exp $ */ /* $NetBSD: rasops.c,v 1.35 2001/02/02 06:01:01 marcus Exp $ */ /*- @@ -35,7 +35,6 @@ #include <sys/systm.h> #include <sys/time.h> #include <sys/task.h> -#include <sys/endian.h> #include <dev/wscons/wsdisplayvar.h> #include <dev/wscons/wsconsio.h> diff --git a/sys/dev/rnd.c b/sys/dev/rnd.c index d5e3b67e63e..9074bd52569 100644 --- a/sys/dev/rnd.c +++ b/sys/dev/rnd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rnd.c,v 1.172 2015/02/17 22:34:59 tedu Exp $ */ +/* $OpenBSD: rnd.c,v 1.173 2015/03/14 03:38:46 jsg Exp $ */ /* * Copyright (c) 2011 Theo de Raadt. @@ -112,7 +112,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/conf.h> #include <sys/disk.h> #include <sys/event.h> #include <sys/limits.h> diff --git a/sys/dev/sdmmc/sdhc.c b/sys/dev/sdmmc/sdhc.c index d3c79248ef5..ac06ca3153a 100644 --- a/sys/dev/sdmmc/sdhc.c +++ b/sys/dev/sdmmc/sdhc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sdhc.c,v 1.38 2014/07/12 18:48:52 tedu Exp $ */ +/* $OpenBSD: sdhc.c,v 1.39 2015/03/14 03:38:49 jsg Exp $ */ /* * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org> @@ -24,7 +24,6 @@ #include <sys/param.h> #include <sys/device.h> #include <sys/kernel.h> -#include <sys/kthread.h> #include <sys/malloc.h> #include <sys/systm.h> diff --git a/sys/dev/sdmmc/sdmmc.c b/sys/dev/sdmmc/sdmmc.c index 05a5f17cc68..19cf9341622 100644 --- a/sys/dev/sdmmc/sdmmc.c +++ b/sys/dev/sdmmc/sdmmc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sdmmc.c,v 1.37 2015/02/16 17:35:17 miod Exp $ */ +/* $OpenBSD: sdmmc.c,v 1.38 2015/03/14 03:38:49 jsg Exp $ */ /* * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org> @@ -33,7 +33,6 @@ #include <scsi/scsi_all.h> #include <scsi/scsiconf.h> -#include <dev/sdmmc/sdmmc_ioreg.h> #include <dev/sdmmc/sdmmc_scsi.h> #include <dev/sdmmc/sdmmcchip.h> #include <dev/sdmmc/sdmmcreg.h> diff --git a/sys/dev/sdmmc/sdmmc_io.c b/sys/dev/sdmmc/sdmmc_io.c index 86d14205dfa..f9cdc469430 100644 --- a/sys/dev/sdmmc/sdmmc_io.c +++ b/sys/dev/sdmmc/sdmmc_io.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sdmmc_io.c,v 1.21 2014/09/14 14:17:25 jsg Exp $ */ +/* $OpenBSD: sdmmc_io.c,v 1.22 2015/03/14 03:38:49 jsg Exp $ */ /* * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org> @@ -26,7 +26,6 @@ #include <dev/sdmmc/sdmmc_ioreg.h> #include <dev/sdmmc/sdmmcchip.h> -#include <dev/sdmmc/sdmmcreg.h> #include <dev/sdmmc/sdmmcvar.h> struct sdmmc_intr_handler { diff --git a/sys/dev/sdmmc/sdmmc_scsi.c b/sys/dev/sdmmc/sdmmc_scsi.c index 02b15991258..fc6d8d03bc2 100644 --- a/sys/dev/sdmmc/sdmmc_scsi.c +++ b/sys/dev/sdmmc/sdmmc_scsi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sdmmc_scsi.c,v 1.34 2014/12/09 07:05:06 doug Exp $ */ +/* $OpenBSD: sdmmc_scsi.c,v 1.35 2015/03/14 03:38:49 jsg Exp $ */ /* * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org> @@ -21,7 +21,6 @@ #include <sys/param.h> #include <sys/buf.h> #include <sys/device.h> -#include <sys/kernel.h> #include <sys/malloc.h> #include <sys/proc.h> #include <sys/systm.h> diff --git a/sys/dev/softraid.c b/sys/dev/softraid.c index 9dee6c5d64a..5929e77d497 100644 --- a/sys/dev/softraid.c +++ b/sys/dev/softraid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softraid.c,v 1.349 2015/02/09 03:15:41 dlg Exp $ */ +/* $OpenBSD: softraid.c,v 1.350 2015/03/14 03:38:46 jsg Exp $ */ /* * Copyright (c) 2007, 2008, 2009 Marco Peereboom <marco@peereboom.us> * Copyright (c) 2008 Chris Kuethe <ckuethe@openbsd.org> @@ -43,8 +43,6 @@ #include <sys/kthread.h> #include <sys/dkio.h> -#include <crypto/cryptodev.h> - #include <scsi/scsi_all.h> #include <scsi/scsiconf.h> #include <scsi/scsi_disk.h> diff --git a/sys/dev/softraid_crypto.c b/sys/dev/softraid_crypto.c index 811793b8cf4..aa6bdb98810 100644 --- a/sys/dev/softraid_crypto.c +++ b/sys/dev/softraid_crypto.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softraid_crypto.c,v 1.116 2014/12/19 17:15:16 tedu Exp $ */ +/* $OpenBSD: softraid_crypto.c,v 1.117 2015/03/14 03:38:46 jsg Exp $ */ /* * Copyright (c) 2007 Marco Peereboom <marco@peereboom.us> * Copyright (c) 2008 Hans-Joerg Hoexer <hshoexer@openbsd.org> @@ -42,7 +42,6 @@ #include <sys/dkio.h> #include <crypto/cryptodev.h> -#include <crypto/cryptosoft.h> #include <crypto/rijndael.h> #include <crypto/md5.h> #include <crypto/sha1.h> diff --git a/sys/dev/softraid_raid6.c b/sys/dev/softraid_raid6.c index 2425281ae89..1dab4e3555b 100644 --- a/sys/dev/softraid_raid6.c +++ b/sys/dev/softraid_raid6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softraid_raid6.c,v 1.63 2014/09/14 14:17:24 jsg Exp $ */ +/* $OpenBSD: softraid_raid6.c,v 1.64 2015/03/14 03:38:46 jsg Exp $ */ /* * Copyright (c) 2009 Marco Peereboom <marco@peereboom.us> * Copyright (c) 2009 Jordan Hargrave <jordan@openbsd.org> @@ -42,7 +42,6 @@ #include <scsi/scsi_disk.h> #include <dev/softraidvar.h> -#include <dev/rndvar.h> uint8_t *gf_map[256]; uint8_t gf_pow[768]; diff --git a/sys/dev/systrace.c b/sys/dev/systrace.c index baa7bc690d7..d54f935953d 100644 --- a/sys/dev/systrace.c +++ b/sys/dev/systrace.c @@ -1,4 +1,4 @@ -/* $OpenBSD: systrace.c,v 1.74 2015/02/10 22:03:11 miod Exp $ */ +/* $OpenBSD: systrace.c,v 1.75 2015/03/14 03:38:46 jsg Exp $ */ /* * Copyright 2002 Niels Provos <provos@citi.umich.edu> * All rights reserved. @@ -35,7 +35,6 @@ #include <sys/syscall.h> #include <sys/vnode.h> #include <sys/errno.h> -#include <sys/conf.h> #include <sys/device.h> #include <sys/proc.h> #include <sys/file.h> diff --git a/sys/dev/usb/hidkbd.c b/sys/dev/usb/hidkbd.c index a8fd748e803..13c7413adc4 100644 --- a/sys/dev/usb/hidkbd.c +++ b/sys/dev/usb/hidkbd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hidkbd.c,v 1.13 2014/07/12 18:48:52 tedu Exp $ */ +/* $OpenBSD: hidkbd.c,v 1.14 2015/03/14 03:38:49 jsg Exp $ */ /* $NetBSD: ukbd.c,v 1.85 2003/03/11 16:44:00 augustss Exp $ */ /* @@ -55,7 +55,6 @@ #include <dev/wscons/wsksymvar.h> #include <dev/usb/hidkbdsc.h> -#include <dev/usb/hidkbdvar.h> #ifdef HIDKBD_DEBUG #define DPRINTF(x) do { if (hidkbddebug) printf x; } while (0) diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c index f02836d984f..3de28788c02 100644 --- a/sys/dev/usb/if_aue.c +++ b/sys/dev/usb/if_aue.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_aue.c,v 1.96 2015/01/12 04:49:41 brad Exp $ */ +/* $OpenBSD: if_aue.c,v 1.97 2015/03/14 03:38:49 jsg Exp $ */ /* $NetBSD: if_aue.c,v 1.82 2003/03/05 17:37:36 shiba Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -100,7 +100,6 @@ #include <netinet/in.h> #include <netinet/if_ether.h> -#include <dev/mii/mii.h> #include <dev/mii/miivar.h> #include <dev/usb/usb.h> diff --git a/sys/dev/usb/if_cdce.c b/sys/dev/usb/if_cdce.c index f52726a6ba9..cc7958e939e 100644 --- a/sys/dev/usb/if_cdce.c +++ b/sys/dev/usb/if_cdce.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_cdce.c,v 1.62 2014/12/22 02:28:52 tedu Exp $ */ +/* $OpenBSD: if_cdce.c,v 1.63 2015/03/14 03:38:49 jsg Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul <wpaul@windriver.com> @@ -51,7 +51,6 @@ #include <sys/device.h> #include <net/if.h> -#include <net/if_dl.h> #include <net/bpf.h> #if NBPFILTER > 0 diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c index 3944ceb3c5f..2c8069f69cc 100644 --- a/sys/dev/usb/if_cue.c +++ b/sys/dev/usb/if_cue.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_cue.c,v 1.68 2015/02/04 05:12:13 mpi Exp $ */ +/* $OpenBSD: if_cue.c,v 1.69 2015/03/14 03:38:49 jsg Exp $ */ /* $NetBSD: if_cue.c,v 1.40 2002/07/11 21:14:26 augustss Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -68,7 +68,6 @@ #include <sys/device.h> #include <net/if.h> -#include <net/if_dl.h> #if NBPFILTER > 0 #include <net/bpf.h> diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c index af3e5185b06..d1809ba0dc4 100644 --- a/sys/dev/usb/if_kue.c +++ b/sys/dev/usb/if_kue.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_kue.c,v 1.77 2015/02/04 05:12:13 mpi Exp $ */ +/* $OpenBSD: if_kue.c,v 1.78 2015/03/14 03:38:49 jsg Exp $ */ /* $NetBSD: if_kue.c,v 1.50 2002/07/16 22:00:31 augustss Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -82,7 +82,6 @@ #include <sys/device.h> #include <net/if.h> -#include <net/if_dl.h> #if NBPFILTER > 0 #include <net/bpf.h> diff --git a/sys/dev/usb/if_mos.c b/sys/dev/usb/if_mos.c index 51d6d05a866..8db8040f571 100644 --- a/sys/dev/usb/if_mos.c +++ b/sys/dev/usb/if_mos.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_mos.c,v 1.27 2014/12/22 02:28:52 tedu Exp $ */ +/* $OpenBSD: if_mos.c,v 1.28 2015/03/14 03:38:49 jsg Exp $ */ /* * Copyright (c) 2008 Johann Christian Rode <jcrode@gmx.net> @@ -95,7 +95,6 @@ #include <netinet/in.h> #include <netinet/if_ether.h> -#include <dev/mii/mii.h> #include <dev/mii/miivar.h> #include <dev/usb/usb.h> diff --git a/sys/dev/usb/if_otus.c b/sys/dev/usb/if_otus.c index f0c79356917..7b722e47be5 100644 --- a/sys/dev/usb/if_otus.c +++ b/sys/dev/usb/if_otus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_otus.c,v 1.45 2015/02/10 23:25:46 mpi Exp $ */ +/* $OpenBSD: if_otus.c,v 1.46 2015/03/14 03:38:49 jsg Exp $ */ /*- * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr> @@ -33,7 +33,6 @@ #include <sys/device.h> #include <sys/endian.h> -#include <machine/bus.h> #include <machine/intr.h> #if NBPFILTER > 0 diff --git a/sys/dev/usb/if_ral.c b/sys/dev/usb/if_ral.c index ca953202a33..277ac43519b 100644 --- a/sys/dev/usb/if_ral.c +++ b/sys/dev/usb/if_ral.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ral.c,v 1.131 2015/02/10 23:25:46 mpi Exp $ */ +/* $OpenBSD: if_ral.c,v 1.132 2015/03/14 03:38:49 jsg Exp $ */ /*- * Copyright (c) 2005, 2006 @@ -35,7 +35,6 @@ #include <sys/device.h> #include <sys/endian.h> -#include <machine/bus.h> #include <machine/intr.h> #if NBPFILTER > 0 diff --git a/sys/dev/usb/if_rsu.c b/sys/dev/usb/if_rsu.c index 60a64c12fd1..72f4b0b6945 100644 --- a/sys/dev/usb/if_rsu.c +++ b/sys/dev/usb/if_rsu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_rsu.c,v 1.25 2015/02/10 23:25:46 mpi Exp $ */ +/* $OpenBSD: if_rsu.c,v 1.26 2015/03/14 03:38:49 jsg Exp $ */ /*- * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr> @@ -33,7 +33,6 @@ #include <sys/device.h> #include <sys/endian.h> -#include <machine/bus.h> #include <machine/intr.h> #if NBPFILTER > 0 diff --git a/sys/dev/usb/if_rum.c b/sys/dev/usb/if_rum.c index bbfebf5449d..ce8d27de106 100644 --- a/sys/dev/usb/if_rum.c +++ b/sys/dev/usb/if_rum.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_rum.c,v 1.109 2015/02/10 23:25:46 mpi Exp $ */ +/* $OpenBSD: if_rum.c,v 1.110 2015/03/14 03:38:49 jsg Exp $ */ /*- * Copyright (c) 2005-2007 Damien Bergamini <damien.bergamini@free.fr> @@ -35,7 +35,6 @@ #include <sys/device.h> #include <sys/endian.h> -#include <machine/bus.h> #include <machine/intr.h> #if NBPFILTER > 0 diff --git a/sys/dev/usb/if_run.c b/sys/dev/usb/if_run.c index 390af789e3f..5c3ffc3cf2c 100644 --- a/sys/dev/usb/if_run.c +++ b/sys/dev/usb/if_run.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_run.c,v 1.107 2015/02/10 23:25:46 mpi Exp $ */ +/* $OpenBSD: if_run.c,v 1.108 2015/03/14 03:38:49 jsg Exp $ */ /*- * Copyright (c) 2008-2010 Damien Bergamini <damien.bergamini@free.fr> @@ -35,7 +35,6 @@ #include <sys/device.h> #include <sys/endian.h> -#include <machine/bus.h> #include <machine/intr.h> #if NBPFILTER > 0 diff --git a/sys/dev/usb/if_smsc.c b/sys/dev/usb/if_smsc.c index 44875f4d4a3..12cfcebf370 100644 --- a/sys/dev/usb/if_smsc.c +++ b/sys/dev/usb/if_smsc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_smsc.c,v 1.14 2014/12/22 02:28:52 tedu Exp $ */ +/* $OpenBSD: if_smsc.c,v 1.15 2015/03/14 03:38:49 jsg Exp $ */ /* $FreeBSD: src/sys/dev/usb/net/if_smsc.c,v 1.1 2012/08/15 04:03:55 gonzo Exp $ */ /*- * Copyright (c) 2012 @@ -84,7 +84,6 @@ #include <netinet/in.h> #include <netinet/if_ether.h> -#include <dev/mii/mii.h> #include <dev/mii/miivar.h> #include <dev/usb/usb.h> diff --git a/sys/dev/usb/if_uath.c b/sys/dev/usb/if_uath.c index 3dd7afb93a7..33ca8b69597 100644 --- a/sys/dev/usb/if_uath.c +++ b/sys/dev/usb/if_uath.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_uath.c,v 1.66 2015/02/10 23:25:46 mpi Exp $ */ +/* $OpenBSD: if_uath.c,v 1.67 2015/03/14 03:38:49 jsg Exp $ */ /*- * Copyright (c) 2006 @@ -57,8 +57,6 @@ #include <net80211/ieee80211_var.h> #include <net80211/ieee80211_radiotap.h> -#include <crypto/arc4.h> - #include <dev/usb/usb.h> #include <dev/usb/usbdi.h> #include <dev/usb/usbdivar.h> /* needs_reattach() */ diff --git a/sys/dev/usb/if_udav.c b/sys/dev/usb/if_udav.c index 9706de0c973..eb5e4257305 100644 --- a/sys/dev/usb/if_udav.c +++ b/sys/dev/usb/if_udav.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_udav.c,v 1.68 2014/12/22 02:28:52 tedu Exp $ */ +/* $OpenBSD: if_udav.c,v 1.69 2015/03/14 03:38:49 jsg Exp $ */ /* $NetBSD: if_udav.c,v 1.3 2004/04/23 17:25:25 itojun Exp $ */ /* $nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $ */ /* @@ -68,7 +68,6 @@ #include <netinet/in.h> #include <netinet/if_ether.h> -#include <dev/mii/mii.h> #include <dev/mii/miivar.h> #include <dev/usb/usb.h> diff --git a/sys/dev/usb/if_ugl.c b/sys/dev/usb/if_ugl.c index 9672dc5b9ca..f2c766d1983 100644 --- a/sys/dev/usb/if_ugl.c +++ b/sys/dev/usb/if_ugl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ugl.c,v 1.9 2015/02/04 05:12:13 mpi Exp $ */ +/* $OpenBSD: if_ugl.c,v 1.10 2015/03/14 03:38:49 jsg Exp $ */ /* $NetBSD: if_upl.c,v 1.19 2002/07/11 21:14:26 augustss Exp $ */ /* * Copyright (c) 2013 SASANO Takayoshi <uaa@uaa.org.uk> @@ -65,7 +65,6 @@ #include <net/if.h> #include <net/if_types.h> -#include <net/if_dl.h> #include <net/netisr.h> #if NBPFILTER > 0 diff --git a/sys/dev/usb/if_upgt.c b/sys/dev/usb/if_upgt.c index 5a237466ab2..e7426fc9e29 100644 --- a/sys/dev/usb/if_upgt.c +++ b/sys/dev/usb/if_upgt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_upgt.c,v 1.66 2014/12/22 02:28:52 tedu Exp $ */ +/* $OpenBSD: if_upgt.c,v 1.67 2015/03/14 03:38:49 jsg Exp $ */ /* * Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org> @@ -29,7 +29,6 @@ #include <sys/device.h> #include <sys/endian.h> -#include <machine/bus.h> #include <machine/intr.h> #if NBPFILTER > 0 diff --git a/sys/dev/usb/if_upl.c b/sys/dev/usb/if_upl.c index 0a0ff554a25..1219072fe4b 100644 --- a/sys/dev/usb/if_upl.c +++ b/sys/dev/usb/if_upl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_upl.c,v 1.62 2015/02/04 05:12:13 mpi Exp $ */ +/* $OpenBSD: if_upl.c,v 1.63 2015/03/14 03:38:49 jsg Exp $ */ /* $NetBSD: if_upl.c,v 1.19 2002/07/11 21:14:26 augustss Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -48,7 +48,6 @@ #include <net/if.h> #include <net/if_types.h> -#include <net/if_dl.h> #include <net/netisr.h> #if NBPFILTER > 0 diff --git a/sys/dev/usb/if_url.c b/sys/dev/usb/if_url.c index eb8941ed441..6124ddad1b8 100644 --- a/sys/dev/usb/if_url.c +++ b/sys/dev/usb/if_url.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_url.c,v 1.72 2015/02/12 09:08:47 mpi Exp $ */ +/* $OpenBSD: if_url.c,v 1.73 2015/03/14 03:38:49 jsg Exp $ */ /* $NetBSD: if_url.c,v 1.6 2002/09/29 10:19:21 martin Exp $ */ /* * Copyright (c) 2001, 2002 @@ -54,7 +54,6 @@ #include <sys/device.h> #include <net/if.h> -#include <net/if_arp.h> #include <net/if_dl.h> #include <net/if_media.h> diff --git a/sys/dev/usb/if_urndis.c b/sys/dev/usb/if_urndis.c index 2c6c30ea6ed..3b654ef6346 100644 --- a/sys/dev/usb/if_urndis.c +++ b/sys/dev/usb/if_urndis.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_urndis.c,v 1.53 2015/03/11 16:07:22 mpi Exp $ */ +/* $OpenBSD: if_urndis.c,v 1.54 2015/03/14 03:38:49 jsg Exp $ */ /* * Copyright (c) 2010 Jonathan Armani <armani@openbsd.org> @@ -49,7 +49,6 @@ #include <dev/usb/usbdi_util.h> #include <dev/usb/usbdivar.h> #include <dev/usb/usbdevs.h> -#include <dev/usb/usbcdc.h> #include <dev/usb/if_urndisreg.h> diff --git a/sys/dev/usb/if_urtw.c b/sys/dev/usb/if_urtw.c index 65ffdff2e17..d369cd9cc67 100644 --- a/sys/dev/usb/if_urtw.c +++ b/sys/dev/usb/if_urtw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_urtw.c,v 1.51 2015/02/10 23:25:46 mpi Exp $ */ +/* $OpenBSD: if_urtw.c,v 1.52 2015/03/14 03:38:49 jsg Exp $ */ /*- * Copyright (c) 2009 Martynas Venckus <martynas@openbsd.org> @@ -31,7 +31,6 @@ #include <sys/device.h> #include <sys/endian.h> -#include <machine/bus.h> #if NBPFILTER > 0 #include <net/bpf.h> #endif diff --git a/sys/dev/usb/if_urtwn.c b/sys/dev/usb/if_urtwn.c index 38b7b11bcb5..2196ad5b7ac 100644 --- a/sys/dev/usb/if_urtwn.c +++ b/sys/dev/usb/if_urtwn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_urtwn.c,v 1.42 2015/02/10 23:25:46 mpi Exp $ */ +/* $OpenBSD: if_urtwn.c,v 1.43 2015/03/14 03:38:49 jsg Exp $ */ /*- * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr> @@ -33,7 +33,6 @@ #include <sys/device.h> #include <sys/endian.h> -#include <machine/bus.h> #include <machine/intr.h> #if NBPFILTER > 0 diff --git a/sys/dev/usb/if_zyd.c b/sys/dev/usb/if_zyd.c index 6b93a4b995d..5d0eb825537 100644 --- a/sys/dev/usb/if_zyd.c +++ b/sys/dev/usb/if_zyd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_zyd.c,v 1.107 2015/02/10 23:25:46 mpi Exp $ */ +/* $OpenBSD: if_zyd.c,v 1.108 2015/03/14 03:38:49 jsg Exp $ */ /*- * Copyright (c) 2006 by Damien Bergamini <damien.bergamini@free.fr> @@ -35,8 +35,6 @@ #include <sys/device.h> #include <sys/endian.h> -#include <machine/bus.h> - #if NBPFILTER > 0 #include <net/bpf.h> #endif diff --git a/sys/dev/usb/moscom.c b/sys/dev/usb/moscom.c index 60975c7136c..90873b81568 100644 --- a/sys/dev/usb/moscom.c +++ b/sys/dev/usb/moscom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: moscom.c,v 1.21 2014/11/18 23:55:01 krw Exp $ */ +/* $OpenBSD: moscom.c,v 1.22 2015/03/14 03:38:49 jsg Exp $ */ /* * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org> @@ -19,7 +19,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> -#include <sys/conf.h> #include <sys/tty.h> #include <sys/device.h> diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c index 6e3bfe53d27..40c4a4a48b5 100644 --- a/sys/dev/usb/ohci.c +++ b/sys/dev/usb/ohci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ohci.c,v 1.142 2014/12/19 22:44:59 guenther Exp $ */ +/* $OpenBSD: ohci.c,v 1.143 2015/03/14 03:38:49 jsg Exp $ */ /* $NetBSD: ohci.c,v 1.139 2003/02/22 05:24:16 tsutsui Exp $ */ /* $FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $ */ @@ -35,7 +35,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> -#include <sys/kernel.h> #include <sys/device.h> #include <sys/queue.h> #include <sys/timeout.h> diff --git a/sys/dev/usb/uark.c b/sys/dev/usb/uark.c index 8e9875c3585..6e6cd232949 100644 --- a/sys/dev/usb/uark.c +++ b/sys/dev/usb/uark.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uark.c,v 1.21 2014/11/18 23:55:01 krw Exp $ */ +/* $OpenBSD: uark.c,v 1.22 2015/03/14 03:38:49 jsg Exp $ */ /* * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org> @@ -19,7 +19,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> -#include <sys/conf.h> #include <sys/tty.h> #include <sys/device.h> diff --git a/sys/dev/usb/uaudio.c b/sys/dev/usb/uaudio.c index a66dab42b65..fed8a681876 100644 --- a/sys/dev/usb/uaudio.c +++ b/sys/dev/usb/uaudio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uaudio.c,v 1.109 2015/01/12 07:12:58 deraadt Exp $ */ +/* $OpenBSD: uaudio.c,v 1.110 2015/03/14 03:38:49 jsg Exp $ */ /* $NetBSD: uaudio.c,v 1.90 2004/10/29 17:12:53 kent Exp $ */ /* @@ -53,7 +53,6 @@ #include <sys/audioio.h> #include <dev/audio_if.h> #include <dev/mulaw.h> -#include <dev/auconv.h> #include <dev/usb/usb.h> #include <dev/usb/usbdevs.h> diff --git a/sys/dev/usb/ubcmtp.c b/sys/dev/usb/ubcmtp.c index e0ee7b085a7..b00cccafc4e 100644 --- a/sys/dev/usb/ubcmtp.c +++ b/sys/dev/usb/ubcmtp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ubcmtp.c,v 1.6 2014/07/12 18:48:52 tedu Exp $ */ +/* $OpenBSD: ubcmtp.c,v 1.7 2015/03/14 03:38:49 jsg Exp $ */ /* * Copyright (c) 2013-2014, joshua stein <jcs@openbsd.org> @@ -48,7 +48,6 @@ #include <dev/usb/usbdi.h> #include <dev/usb/usbdevs.h> #include <dev/usb/uhidev.h> -#include <dev/usb/hid.h> #include <dev/usb/usbhid.h> #include <dev/wscons/wsconsio.h> diff --git a/sys/dev/usb/ubsa.c b/sys/dev/usb/ubsa.c index 3b6e8a40ff4..7642e22c548 100644 --- a/sys/dev/usb/ubsa.c +++ b/sys/dev/usb/ubsa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ubsa.c,v 1.63 2014/07/12 20:26:33 mpi Exp $ */ +/* $OpenBSD: ubsa.c,v 1.64 2015/03/14 03:38:49 jsg Exp $ */ /* $NetBSD: ubsa.c,v 1.5 2002/11/25 00:51:33 fvdl Exp $ */ /*- * Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>. @@ -73,7 +73,6 @@ #include <dev/usb/usbdi.h> #include <dev/usb/usbdi_util.h> #include <dev/usb/usbdevs.h> -#include <dev/usb/usb_quirks.h> #include <dev/usb/ucomvar.h> diff --git a/sys/dev/usb/uchcom.c b/sys/dev/usb/uchcom.c index 3d45d4327f7..127e13de1da 100644 --- a/sys/dev/usb/uchcom.c +++ b/sys/dev/usb/uchcom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uchcom.c,v 1.22 2014/07/12 20:26:33 mpi Exp $ */ +/* $OpenBSD: uchcom.c,v 1.23 2015/03/14 03:38:49 jsg Exp $ */ /* $NetBSD: uchcom.c,v 1.1 2007/09/03 17:57:37 tshiozak Exp $ */ /* @@ -38,7 +38,6 @@ #include <sys/systm.h> #include <sys/kernel.h> #include <sys/malloc.h> -#include <sys/conf.h> #include <sys/tty.h> #include <sys/device.h> diff --git a/sys/dev/usb/ucom.c b/sys/dev/usb/ucom.c index 9034b95af47..b3c2043a3ce 100644 --- a/sys/dev/usb/ucom.c +++ b/sys/dev/usb/ucom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ucom.c,v 1.64 2014/05/06 09:44:31 mpi Exp $ */ +/* $OpenBSD: ucom.c,v 1.65 2015/03/14 03:38:49 jsg Exp $ */ /* $NetBSD: ucom.c,v 1.49 2003/01/01 00:10:25 thorpej Exp $ */ /* @@ -53,7 +53,6 @@ #include <dev/usb/usbdi_util.h> #include <dev/usb/uhidev.h> #include <dev/usb/usbdevs.h> -#include <dev/usb/usb_quirks.h> #include <dev/usb/ucomvar.h> diff --git a/sys/dev/usb/udcf.c b/sys/dev/usb/udcf.c index 8d4a42aaeed..1b06db1fb09 100644 --- a/sys/dev/usb/udcf.c +++ b/sys/dev/usb/udcf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: udcf.c,v 1.58 2014/07/12 20:26:33 mpi Exp $ */ +/* $OpenBSD: udcf.c,v 1.59 2015/03/14 03:38:49 jsg Exp $ */ /* * Copyright (c) 2006, 2007, 2008 Marc Balmer <mbalmer@openbsd.org> @@ -19,7 +19,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> -#include <sys/conf.h> #include <sys/file.h> #include <sys/select.h> #include <sys/device.h> diff --git a/sys/dev/usb/udl.c b/sys/dev/usb/udl.c index 167648e2cb2..70122084a95 100644 --- a/sys/dev/usb/udl.c +++ b/sys/dev/usb/udl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: udl.c,v 1.81 2014/12/09 07:05:06 doug Exp $ */ +/* $OpenBSD: udl.c,v 1.82 2015/03/14 03:38:49 jsg Exp $ */ /* * Copyright (c) 2009 Marcus Glocker <mglocker@openbsd.org> @@ -36,8 +36,6 @@ #include <uvm/uvm_extern.h> -#include <machine/bus.h> - #include <dev/usb/usb.h> #include <dev/usb/usbdi.h> #include <dev/usb/usbdi_util.h> diff --git a/sys/dev/usb/udsbr.c b/sys/dev/usb/udsbr.c index a83fd521a16..4b3628b8422 100644 --- a/sys/dev/usb/udsbr.c +++ b/sys/dev/usb/udsbr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: udsbr.c,v 1.25 2013/11/07 12:06:25 pirofti Exp $ */ +/* $OpenBSD: udsbr.c,v 1.26 2015/03/14 03:38:49 jsg Exp $ */ /* $NetBSD: udsbr.c,v 1.7 2002/07/11 21:14:27 augustss Exp $ */ /* @@ -40,7 +40,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/device.h> #include <sys/radioio.h> diff --git a/sys/dev/usb/uftdi.c b/sys/dev/usb/uftdi.c index dd77648f96b..c0a2cd84a32 100644 --- a/sys/dev/usb/uftdi.c +++ b/sys/dev/usb/uftdi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uftdi.c,v 1.72 2014/07/12 20:26:33 mpi Exp $ */ +/* $OpenBSD: uftdi.c,v 1.73 2015/03/14 03:38:49 jsg Exp $ */ /* $NetBSD: uftdi.c,v 1.14 2003/02/23 04:20:07 simonb Exp $ */ /* @@ -47,7 +47,6 @@ #include <sys/tty.h> #include <dev/usb/usb.h> -#include <dev/usb/usbhid.h> #include <dev/usb/usbdi.h> #include <dev/usb/usbdi_util.h> diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c index afb0b62eb8e..0ff96505d10 100644 --- a/sys/dev/usb/ugen.c +++ b/sys/dev/usb/ugen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ugen.c,v 1.81 2015/02/10 21:56:09 miod Exp $ */ +/* $OpenBSD: ugen.c,v 1.82 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: ugen.c,v 1.63 2002/11/26 18:49:48 christos Exp $ */ /* $FreeBSD: src/sys/dev/usb/ugen.c,v 1.26 1999/11/17 22:33:41 n_hibma Exp $ */ @@ -49,7 +49,6 @@ #include <dev/usb/usb.h> #include <dev/usb/usbdi.h> #include <dev/usb/usbdi_util.h> -#include <dev/usb/usbdevs.h> #ifdef UGEN_DEBUG #define DPRINTF(x) do { if (ugendebug) printf x; } while (0) diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c index 3676bd26b95..5af934b78b1 100644 --- a/sys/dev/usb/uhci.c +++ b/sys/dev/usb/uhci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uhci.c,v 1.135 2014/12/19 22:44:59 guenther Exp $ */ +/* $OpenBSD: uhci.c,v 1.136 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: uhci.c,v 1.172 2003/02/23 04:19:26 simonb Exp $ */ /* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $ */ @@ -34,7 +34,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/malloc.h> #include <sys/device.h> #include <sys/queue.h> diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c index c24b9e5aac3..d64c889d1da 100644 --- a/sys/dev/usb/uhid.c +++ b/sys/dev/usb/uhid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uhid.c,v 1.60 2015/02/10 21:56:09 miod Exp $ */ +/* $OpenBSD: uhid.c,v 1.61 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: uhid.c,v 1.57 2003/03/11 16:44:00 augustss Exp $ */ /* @@ -57,7 +57,6 @@ #include <dev/usb/usbdi.h> #include <dev/usb/usbdi_util.h> #include <dev/usb/hid.h> -#include <dev/usb/usb_quirks.h> #include <dev/usb/uhidev.h> diff --git a/sys/dev/usb/uipaq.c b/sys/dev/usb/uipaq.c index 3f27e857095..f1139f9a7b8 100644 --- a/sys/dev/usb/uipaq.c +++ b/sys/dev/usb/uipaq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipaq.c,v 1.24 2014/07/12 20:26:33 mpi Exp $ */ +/* $OpenBSD: uipaq.c,v 1.25 2015/03/14 03:38:50 jsg Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -48,7 +48,6 @@ #include <sys/tty.h> #include <dev/usb/usb.h> -#include <dev/usb/usbhid.h> #include <dev/usb/usbcdc.h> /*UCDC_* stuff */ diff --git a/sys/dev/usb/ukbd.c b/sys/dev/usb/ukbd.c index 31cc4c9ae9c..59b9396ee32 100644 --- a/sys/dev/usb/ukbd.c +++ b/sys/dev/usb/ukbd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ukbd.c,v 1.70 2015/01/19 20:16:10 miod Exp $ */ +/* $OpenBSD: ukbd.c,v 1.71 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: ukbd.c,v 1.85 2003/03/11 16:44:00 augustss Exp $ */ /* @@ -74,7 +74,6 @@ #include <dev/wscons/wsksymvar.h> #include <dev/usb/hidkbdsc.h> -#include <dev/usb/hidkbdvar.h> #ifdef UKBD_DEBUG #define DPRINTF(x) do { if (ukbddebug) printf x; } while (0) diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c index 2d313749459..3694ede6bc8 100644 --- a/sys/dev/usb/ulpt.c +++ b/sys/dev/usb/ulpt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ulpt.c,v 1.49 2015/02/10 21:56:09 miod Exp $ */ +/* $OpenBSD: ulpt.c,v 1.50 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: ulpt.c,v 1.57 2003/01/05 10:19:42 scw Exp $ */ /* $FreeBSD: src/sys/dev/usb/ulpt.c,v 1.24 1999/11/17 22:33:44 n_hibma Exp $ */ @@ -39,7 +39,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/device.h> #include <sys/uio.h> #include <sys/conf.h> diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c index 2cff04eef13..8afd1efc0d4 100644 --- a/sys/dev/usb/umass.c +++ b/sys/dev/usb/umass.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umass.c,v 1.69 2015/01/27 11:04:45 mpi Exp $ */ +/* $OpenBSD: umass.c,v 1.70 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: umass.c,v 1.116 2004/06/30 05:53:46 mycroft Exp $ */ /* @@ -142,7 +142,6 @@ #include <dev/usb/usbdi.h> #include <dev/usb/usbdi_util.h> #include <dev/usb/usbdivar.h> -#include <dev/usb/usbdevs.h> #include <dev/usb/umassvar.h> #include <dev/usb/umass_quirks.h> diff --git a/sys/dev/usb/umass_scsi.c b/sys/dev/usb/umass_scsi.c index a1b8b3a1ed9..7753cf72a2a 100644 --- a/sys/dev/usb/umass_scsi.c +++ b/sys/dev/usb/umass_scsi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umass_scsi.c,v 1.41 2014/08/08 14:16:43 mpi Exp $ */ +/* $OpenBSD: umass_scsi.c,v 1.42 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: umass_scsipi.c,v 1.9 2003/02/16 23:14:08 augustss Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -42,7 +42,6 @@ #include <dev/usb/usb.h> #include <dev/usb/usbdi.h> #include <dev/usb/usbdi_util.h> -#include <dev/usb/usbdevs.h> #include <dev/usb/umassvar.h> #include <dev/usb/umass_scsi.h> diff --git a/sys/dev/usb/umcs.c b/sys/dev/usb/umcs.c index 96de4a044ce..74ee17610b1 100644 --- a/sys/dev/usb/umcs.c +++ b/sys/dev/usb/umcs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umcs.c,v 1.1 2014/12/04 11:05:26 mpi Exp $ */ +/* $OpenBSD: umcs.c,v 1.2 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: umcs.c,v 1.8 2014/08/23 21:37:56 martin Exp $ */ /* $FreeBSD: head/sys/dev/usb/serial/umcs.c 260559 2014-01-12 11:44:28Z hselasky $ */ @@ -44,7 +44,6 @@ #include <sys/systm.h> #include <sys/kernel.h> #include <sys/malloc.h> -#include <sys/conf.h> #include <sys/tty.h> #include <sys/device.h> diff --git a/sys/dev/usb/umct.c b/sys/dev/usb/umct.c index 2bed5de30e5..64ae8a65969 100644 --- a/sys/dev/usb/umct.c +++ b/sys/dev/usb/umct.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umct.c,v 1.42 2014/11/18 23:55:01 krw Exp $ */ +/* $OpenBSD: umct.c,v 1.43 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: umct.c,v 1.10 2003/02/23 04:20:07 simonb Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -53,7 +53,6 @@ #include <dev/usb/usbdi.h> #include <dev/usb/usbdi_util.h> #include <dev/usb/usbdevs.h> -#include <dev/usb/usb_quirks.h> #include <dev/usb/ucomvar.h> diff --git a/sys/dev/usb/umidi.c b/sys/dev/usb/umidi.c index 1b567e89bd6..ba0e3b56c27 100644 --- a/sys/dev/usb/umidi.c +++ b/sys/dev/usb/umidi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umidi.c,v 1.40 2014/12/09 07:05:06 doug Exp $ */ +/* $OpenBSD: umidi.c,v 1.41 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: umidi.c,v 1.16 2002/07/11 21:14:32 augustss Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -44,7 +44,6 @@ #include <dev/usb/usbdi.h> #include <dev/usb/usbdi_util.h> -#include <dev/usb/usbdevs.h> #include <dev/usb/uaudioreg.h> #include <dev/usb/umidireg.h> #include <dev/usb/umidivar.h> diff --git a/sys/dev/usb/umidi_quirks.c b/sys/dev/usb/umidi_quirks.c index ace9930102c..e1b47e04b1e 100644 --- a/sys/dev/usb/umidi_quirks.c +++ b/sys/dev/usb/umidi_quirks.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umidi_quirks.c,v 1.12 2013/03/28 03:58:03 tedu Exp $ */ +/* $OpenBSD: umidi_quirks.c,v 1.13 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: umidi_quirks.c,v 1.4 2002/06/19 13:55:30 tshiozak Exp $ */ /* @@ -46,7 +46,6 @@ #include <dev/usb/usbdi_util.h> #include <dev/usb/usbdevs.h> -#include <dev/usb/uaudioreg.h> #include <dev/usb/umidireg.h> #include <dev/usb/umidivar.h> #include <dev/usb/umidi_quirks.h> diff --git a/sys/dev/usb/umodem.c b/sys/dev/usb/umodem.c index e72fdc8713a..b4759b83884 100644 --- a/sys/dev/usb/umodem.c +++ b/sys/dev/usb/umodem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umodem.c,v 1.58 2015/02/16 14:52:39 sthen Exp $ */ +/* $OpenBSD: umodem.c,v 1.59 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: umodem.c,v 1.45 2002/09/23 05:51:23 simonb Exp $ */ /* @@ -59,7 +59,6 @@ #include <dev/usb/usbcdc.h> #include <dev/usb/usbdi.h> -#include <dev/usb/usbdi_util.h> #include <dev/usb/usbdevs.h> #include <dev/usb/usb_quirks.h> diff --git a/sys/dev/usb/umsm.c b/sys/dev/usb/umsm.c index 2aab45f3628..0911751b5e6 100644 --- a/sys/dev/usb/umsm.c +++ b/sys/dev/usb/umsm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umsm.c,v 1.101 2015/01/06 10:42:16 mpi Exp $ */ +/* $OpenBSD: umsm.c,v 1.102 2015/03/14 03:38:50 jsg Exp $ */ /* * Copyright (c) 2008 Yojiro UO <yuo@nui.org> @@ -29,7 +29,6 @@ #include <dev/usb/usb.h> #include <dev/usb/usbdi.h> -#include <dev/usb/usbdi_util.h> #include <dev/usb/usbdevs.h> #include <dev/usb/ucomvar.h> #include <dev/usb/usbcdc.h> diff --git a/sys/dev/usb/uoak_subr.c b/sys/dev/usb/uoak_subr.c index 791fdd653c1..8db59a0426a 100644 --- a/sys/dev/usb/uoak_subr.c +++ b/sys/dev/usb/uoak_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uoak_subr.c,v 1.5 2014/12/11 18:39:27 mpi Exp $ */ +/* $OpenBSD: uoak_subr.c,v 1.6 2015/03/14 03:38:50 jsg Exp $ */ /* * Copyright (c) 2012 Yojiro UO <yuo@nui.org> @@ -33,7 +33,6 @@ #include <dev/usb/usbdi_util.h> #include <dev/usb/usbdevs.h> #include <dev/usb/uhidev.h> -#include <dev/usb/hid.h> #include "uoak.h" #define UOAK_RETRY_DELAY 100 /* 100ms, XXX too long? */ diff --git a/sys/dev/usb/uoaklux.c b/sys/dev/usb/uoaklux.c index 109641a4fd3..8828a366357 100644 --- a/sys/dev/usb/uoaklux.c +++ b/sys/dev/usb/uoaklux.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uoaklux.c,v 1.9 2014/07/12 18:48:52 tedu Exp $ */ +/* $OpenBSD: uoaklux.c,v 1.10 2015/03/14 03:38:50 jsg Exp $ */ /* * Copyright (c) 2012 Yojiro UO <yuo@nui.org> @@ -30,7 +30,6 @@ #include <dev/usb/usb.h> #include <dev/usb/usbhid.h> #include <dev/usb/usbdi.h> -#include <dev/usb/usbdi_util.h> #include <dev/usb/usbdevs.h> #include <dev/usb/uhidev.h> #include <dev/usb/hid.h> diff --git a/sys/dev/usb/uoakrh.c b/sys/dev/usb/uoakrh.c index b61ec037374..c27f9fcd512 100644 --- a/sys/dev/usb/uoakrh.c +++ b/sys/dev/usb/uoakrh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uoakrh.c,v 1.10 2014/07/12 18:48:52 tedu Exp $ */ +/* $OpenBSD: uoakrh.c,v 1.11 2015/03/14 03:38:50 jsg Exp $ */ /* * Copyright (c) 2012 Yojiro UO <yuo@nui.org> @@ -30,7 +30,6 @@ #include <dev/usb/usb.h> #include <dev/usb/usbhid.h> #include <dev/usb/usbdi.h> -#include <dev/usb/usbdi_util.h> #include <dev/usb/usbdevs.h> #include <dev/usb/uhidev.h> #include <dev/usb/hid.h> diff --git a/sys/dev/usb/uoakv.c b/sys/dev/usb/uoakv.c index 77e233b4d56..788ae6c4549 100644 --- a/sys/dev/usb/uoakv.c +++ b/sys/dev/usb/uoakv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uoakv.c,v 1.9 2014/07/12 18:48:52 tedu Exp $ */ +/* $OpenBSD: uoakv.c,v 1.10 2015/03/14 03:38:50 jsg Exp $ */ /* * Copyright (c) 2012 Yojiro UO <yuo@nui.org> @@ -30,7 +30,6 @@ #include <dev/usb/usb.h> #include <dev/usb/usbhid.h> #include <dev/usb/usbdi.h> -#include <dev/usb/usbdi_util.h> #include <dev/usb/usbdevs.h> #include <dev/usb/uhidev.h> #include <dev/usb/hid.h> diff --git a/sys/dev/usb/uplcom.c b/sys/dev/usb/uplcom.c index b6088feb4e2..a7520ef359e 100644 --- a/sys/dev/usb/uplcom.c +++ b/sys/dev/usb/uplcom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uplcom.c,v 1.65 2014/11/18 23:55:01 krw Exp $ */ +/* $OpenBSD: uplcom.c,v 1.66 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: uplcom.c,v 1.29 2002/09/23 05:51:23 simonb Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -55,7 +55,6 @@ #include <dev/usb/usbdi.h> #include <dev/usb/usbdi_util.h> #include <dev/usb/usbdevs.h> -#include <dev/usb/usb_quirks.h> #include <dev/usb/ucomvar.h> diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c index fc175c0c84b..499e09b7607 100644 --- a/sys/dev/usb/usb.c +++ b/sys/dev/usb/usb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: usb.c,v 1.106 2015/02/10 21:56:09 miod Exp $ */ +/* $OpenBSD: usb.c,v 1.107 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: usb.c,v 1.77 2003/01/01 00:10:26 thorpej Exp $ */ /* @@ -63,7 +63,6 @@ #include <machine/bus.h> #include <dev/usb/usbdivar.h> -#include <dev/usb/usb_quirks.h> #ifdef USB_DEBUG #define DPRINTF(x) do { if (usbdebug) printf x; } while (0) diff --git a/sys/dev/usb/usbdi.c b/sys/dev/usb/usbdi.c index c16055df0b0..833ed45adf6 100644 --- a/sys/dev/usb/usbdi.c +++ b/sys/dev/usb/usbdi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: usbdi.c,v 1.80 2015/02/12 05:07:52 uebayasi Exp $ */ +/* $OpenBSD: usbdi.c,v 1.81 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: usbdi.c,v 1.103 2002/09/27 15:37:38 provos Exp $ */ /* $FreeBSD: src/sys/dev/usb/usbdi.c,v 1.28 1999/11/17 22:33:49 n_hibma Exp $ */ @@ -42,7 +42,6 @@ #include <dev/usb/usb.h> #include <dev/usb/usbdi.h> -#include <dev/usb/usbdi_util.h> #include <dev/usb/usbdivar.h> #include <dev/usb/usb_mem.h> diff --git a/sys/dev/usb/usbdi_util.c b/sys/dev/usb/usbdi_util.c index 024908b83ef..34a47d61192 100644 --- a/sys/dev/usb/usbdi_util.c +++ b/sys/dev/usb/usbdi_util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: usbdi_util.c,v 1.40 2014/12/08 22:00:11 mpi Exp $ */ +/* $OpenBSD: usbdi_util.c,v 1.41 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: usbdi_util.c,v 1.40 2002/07/11 21:14:36 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/usbdi_util.c,v 1.14 1999/11/17 22:33:50 n_hibma Exp $ */ @@ -45,7 +45,6 @@ #include <dev/usb/usbdi.h> #include <dev/usb/usbdi_util.h> -#include <dev/usb/usbdivar.h> #ifdef USB_DEBUG #define DPRINTF(x) do { if (usbdebug) printf x; } while (0) diff --git a/sys/dev/usb/uslcom.c b/sys/dev/usb/uslcom.c index bcb45e04a42..dbbc8933599 100644 --- a/sys/dev/usb/uslcom.c +++ b/sys/dev/usb/uslcom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uslcom.c,v 1.33 2014/11/23 21:18:46 sasano Exp $ */ +/* $OpenBSD: uslcom.c,v 1.34 2015/03/14 03:38:50 jsg Exp $ */ /* * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org> @@ -19,7 +19,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> -#include <sys/conf.h> #include <sys/tty.h> #include <sys/device.h> diff --git a/sys/dev/usb/uticom.c b/sys/dev/usb/uticom.c index 135e769fc2d..f2a97897361 100644 --- a/sys/dev/usb/uticom.c +++ b/sys/dev/usb/uticom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uticom.c,v 1.26 2014/07/12 21:24:33 mpi Exp $ */ +/* $OpenBSD: uticom.c,v 1.27 2015/03/14 03:38:50 jsg Exp $ */ /* * Copyright (c) 2005 Dmitry Komissaroff <dxi@mail.ru>. * @@ -35,7 +35,6 @@ #include <machine/bus.h> #include <dev/usb/usb.h> -#include <dev/usb/usbhid.h> #include <dev/usb/usbdi.h> #include <dev/usb/usbdivar.h> diff --git a/sys/dev/usb/uts.c b/sys/dev/usb/uts.c index d04675546e1..0c83fe7189a 100644 --- a/sys/dev/usb/uts.c +++ b/sys/dev/usb/uts.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uts.c,v 1.35 2014/12/19 22:44:59 guenther Exp $ */ +/* $OpenBSD: uts.c,v 1.36 2015/03/14 03:38:50 jsg Exp $ */ /* * Copyright (c) 2007 Robert Nagy <robert@openbsd.org> @@ -28,7 +28,6 @@ #include <sys/device.h> #include <sys/endian.h> -#include <machine/bus.h> #include <machine/intr.h> #include <dev/usb/usb.h> diff --git a/sys/dev/usb/uvisor.c b/sys/dev/usb/uvisor.c index 7640c931cf3..4d55f96cd9a 100644 --- a/sys/dev/usb/uvisor.c +++ b/sys/dev/usb/uvisor.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvisor.c,v 1.49 2014/07/12 21:24:33 mpi Exp $ */ +/* $OpenBSD: uvisor.c,v 1.50 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: uvisor.c,v 1.21 2003/08/03 21:59:26 nathanw Exp $ */ /* @@ -43,7 +43,6 @@ #include <sys/tty.h> #include <dev/usb/usb.h> -#include <dev/usb/usbhid.h> #include <dev/usb/usbdi.h> #include <dev/usb/usbdi_util.h> diff --git a/sys/dev/usb/uvscom.c b/sys/dev/usb/uvscom.c index ce431f80012..b718454f0f8 100644 --- a/sys/dev/usb/uvscom.c +++ b/sys/dev/usb/uvscom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvscom.c,v 1.32 2014/07/12 21:24:33 mpi Exp $ */ +/* $OpenBSD: uvscom.c,v 1.33 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: uvscom.c,v 1.9 2003/02/12 15:36:20 ichiro Exp $ */ /*- * Copyright (c) 2001-2002, Shunsuke Akiyama <akiyama@jp.FreeBSD.org>. @@ -53,7 +53,6 @@ #include <dev/usb/usbdi.h> #include <dev/usb/usbdi_util.h> #include <dev/usb/usbdevs.h> -#include <dev/usb/usb_quirks.h> #include <dev/usb/ucomvar.h> diff --git a/sys/dev/vmt.c b/sys/dev/vmt.c index dc4f0eaadd0..d21ec59e96d 100644 --- a/sys/dev/vmt.c +++ b/sys/dev/vmt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmt.c,v 1.28 2015/02/07 01:19:40 deraadt Exp $ */ +/* $OpenBSD: vmt.c,v 1.29 2015/03/14 03:38:46 jsg Exp $ */ /* * Copyright (c) 2007 David Crawshaw <david@zentus.com> @@ -41,7 +41,6 @@ #include <netinet/in.h> #include <dev/rndvar.h> -#include <dev/vmtvar.h> /* "The" magic number, always occupies the EAX register. */ #define VM_MAGIC 0x564D5868 diff --git a/sys/dev/vscsi.c b/sys/dev/vscsi.c index 904b040e8f8..b3a9d0208fe 100644 --- a/sys/dev/vscsi.c +++ b/sys/dev/vscsi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vscsi.c,v 1.37 2015/01/27 03:17:36 dlg Exp $ */ +/* $OpenBSD: vscsi.c,v 1.38 2015/03/14 03:38:46 jsg Exp $ */ /* * Copyright (c) 2008 David Gwynne <dlg@openbsd.org> @@ -18,7 +18,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/buf.h> #include <sys/kernel.h> #include <sys/malloc.h> #include <sys/device.h> diff --git a/sys/dev/wscons/wsdisplay_compat_usl.c b/sys/dev/wscons/wsdisplay_compat_usl.c index 1b43e4b6697..7ab3d2bbd35 100644 --- a/sys/dev/wscons/wsdisplay_compat_usl.c +++ b/sys/dev/wscons/wsdisplay_compat_usl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsdisplay_compat_usl.c,v 1.26 2014/07/12 18:48:53 tedu Exp $ */ +/* $OpenBSD: wsdisplay_compat_usl.c,v 1.27 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: wsdisplay_compat_usl.c,v 1.12 2000/03/23 07:01:47 thorpej Exp $ */ /* @@ -30,7 +30,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/timeout.h> -#include <sys/ioctl.h> #include <sys/kernel.h> #include <sys/proc.h> #include <sys/signalvar.h> diff --git a/sys/dev/wscons/wsemul_vt100_chars.c b/sys/dev/wscons/wsemul_vt100_chars.c index 521a91d9dcd..3af39552efc 100644 --- a/sys/dev/wscons/wsemul_vt100_chars.c +++ b/sys/dev/wscons/wsemul_vt100_chars.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsemul_vt100_chars.c,v 1.8 2013/10/18 22:06:41 miod Exp $ */ +/* $OpenBSD: wsemul_vt100_chars.c,v 1.9 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: wsemul_vt100_chars.c,v 1.4 1999/02/20 18:20:02 drochner Exp $ */ /* @@ -30,7 +30,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <dev/wscons/wscons_features.h> #include <dev/wscons/wsconsio.h> #include <dev/wscons/wsdisplayvar.h> #include <dev/wscons/wsksymvar.h> diff --git a/sys/dev/wscons/wsemul_vt100_keys.c b/sys/dev/wscons/wsemul_vt100_keys.c index d94618b4bbf..5783649bd10 100644 --- a/sys/dev/wscons/wsemul_vt100_keys.c +++ b/sys/dev/wscons/wsemul_vt100_keys.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsemul_vt100_keys.c,v 1.7 2013/10/18 22:06:41 miod Exp $ */ +/* $OpenBSD: wsemul_vt100_keys.c,v 1.8 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: wsemul_vt100_keys.c,v 1.3 1999/04/22 20:06:02 mycroft Exp $ */ /* @@ -30,7 +30,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <dev/wscons/wscons_features.h> #include <dev/wscons/wsconsio.h> #include <dev/wscons/wsdisplayvar.h> #include <dev/wscons/wsksymvar.h> diff --git a/sys/dev/wscons/wsemul_vt100_subr.c b/sys/dev/wscons/wsemul_vt100_subr.c index 5f463bb5998..c9249c5b0ba 100644 --- a/sys/dev/wscons/wsemul_vt100_subr.c +++ b/sys/dev/wscons/wsemul_vt100_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsemul_vt100_subr.c,v 1.19 2013/10/18 22:06:41 miod Exp $ */ +/* $OpenBSD: wsemul_vt100_subr.c,v 1.20 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: wsemul_vt100_subr.c,v 1.7 2000/04/28 21:56:16 mycroft Exp $ */ /* @@ -30,7 +30,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <dev/wscons/wscons_features.h> #include <dev/wscons/wsconsio.h> #include <dev/wscons/wsksymvar.h> #include <dev/wscons/wsdisplayvar.h> diff --git a/sys/dev/wscons/wsemulconf.c b/sys/dev/wscons/wsemulconf.c index d5b7820cbc0..bab5be014e2 100644 --- a/sys/dev/wscons/wsemulconf.c +++ b/sys/dev/wscons/wsemulconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsemulconf.c,v 1.8 2010/08/28 12:48:14 miod Exp $ */ +/* $OpenBSD: wsemulconf.c,v 1.9 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: wsemulconf.c,v 1.4 2000/01/05 11:19:37 drochner Exp $ */ /* @@ -40,7 +40,6 @@ #include <dev/wscons/wsdisplayvar.h> #include <dev/wscons/wsksymvar.h> #include <dev/wscons/wsemulvar.h> -#include <dev/wscons/wscons_callbacks.h> static const struct wsemul_ops *wsemul_conf[] = { #ifdef WSEMUL_SUN diff --git a/sys/dev/wscons/wsevent.c b/sys/dev/wscons/wsevent.c index acb0fa45b54..94b5ba15f99 100644 --- a/sys/dev/wscons/wsevent.c +++ b/sys/dev/wscons/wsevent.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsevent.c,v 1.12 2015/02/10 21:56:09 miod Exp $ */ +/* $OpenBSD: wsevent.c,v 1.13 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: wsevent.c,v 1.16 2003/08/07 16:31:29 agc Exp $ */ /* @@ -76,7 +76,6 @@ */ #include <sys/param.h> -#include <sys/fcntl.h> #include <sys/malloc.h> #include <sys/systm.h> #include <sys/vnode.h> diff --git a/sys/dev/wscons/wsmouse.c b/sys/dev/wscons/wsmouse.c index b1f5b54f27a..80d08058039 100644 --- a/sys/dev/wscons/wsmouse.c +++ b/sys/dev/wscons/wsmouse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsmouse.c,v 1.26 2014/10/27 13:55:05 mpi Exp $ */ +/* $OpenBSD: wsmouse.c,v 1.27 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: wsmouse.c,v 1.35 2005/02/27 00:27:52 perry Exp $ */ /* @@ -93,7 +93,6 @@ #include <dev/wscons/wsconsio.h> #include <dev/wscons/wsmousevar.h> #include <dev/wscons/wseventvar.h> -#include <dev/wscons/wsdisplayvar.h> #include <dev/rndvar.h> #include "wsmux.h" diff --git a/sys/dev/wscons/wsmux.c b/sys/dev/wscons/wsmux.c index 8068ede2e1a..2014121b3b1 100644 --- a/sys/dev/wscons/wsmux.c +++ b/sys/dev/wscons/wsmux.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsmux.c,v 1.28 2015/01/11 03:04:53 deraadt Exp $ */ +/* $OpenBSD: wsmux.c,v 1.29 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: wsmux.c,v 1.37 2005/04/30 03:47:12 augustss Exp $ */ /* @@ -60,7 +60,6 @@ #include <dev/wscons/wsconsio.h> #include <dev/wscons/wsksymdef.h> #include <dev/wscons/wseventvar.h> -#include <dev/wscons/wscons_callbacks.h> #include <dev/wscons/wsmuxvar.h> #ifdef WSMUX_DEBUG diff --git a/sys/dev/wsfont/wsfont.c b/sys/dev/wsfont/wsfont.c index 1c2b0f113f6..65e64f5aff7 100644 --- a/sys/dev/wsfont/wsfont.c +++ b/sys/dev/wsfont/wsfont.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsfont.c,v 1.39 2015/01/11 13:00:05 deraadt Exp $ */ +/* $OpenBSD: wsfont.c,v 1.40 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: wsfont.c,v 1.17 2001/02/07 13:59:24 ad Exp $ */ /*- @@ -37,7 +37,6 @@ #include <sys/malloc.h> #include <sys/queue.h> -#include <dev/wscons/wsdisplayvar.h> #include <dev/wscons/wsconsio.h> #include <dev/wsfont/wsfont.h> diff --git a/sys/dev/x86emu/x86emu_util.c b/sys/dev/x86emu/x86emu_util.c index e96efc24a42..182a774e397 100644 --- a/sys/dev/x86emu/x86emu_util.c +++ b/sys/dev/x86emu/x86emu_util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x86emu_util.c,v 1.5 2009/06/18 14:19:21 pirofti Exp $ */ +/* $OpenBSD: x86emu_util.c,v 1.6 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: x86emu_util.c,v 1.2 2007/12/04 17:32:22 joerg Exp $ */ /* @@ -36,7 +36,6 @@ #include <sys/endian.h> #include <dev/x86emu/x86emu.h> -#include <dev/x86emu/x86emu_regs.h> diff --git a/sys/isofs/cd9660/cd9660_lookup.c b/sys/isofs/cd9660/cd9660_lookup.c index 82d39c57fdb..5ddc79bd0b0 100644 --- a/sys/isofs/cd9660/cd9660_lookup.c +++ b/sys/isofs/cd9660/cd9660_lookup.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd9660_lookup.c,v 1.22 2014/12/16 18:30:03 tedu Exp $ */ +/* $OpenBSD: cd9660_lookup.c,v 1.23 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: cd9660_lookup.c,v 1.18 1997/05/08 16:19:59 mycroft Exp $ */ /*- @@ -53,7 +53,6 @@ #include <isofs/cd9660/cd9660_extern.h> #include <isofs/cd9660/cd9660_node.h> #include <isofs/cd9660/iso_rrip.h> -#include <isofs/cd9660/cd9660_rrip.h> struct nchstats iso_nchstats; diff --git a/sys/isofs/cd9660/cd9660_node.c b/sys/isofs/cd9660/cd9660_node.c index f5dfd74ef50..23d50a13abc 100644 --- a/sys/isofs/cd9660/cd9660_node.c +++ b/sys/isofs/cd9660/cd9660_node.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd9660_node.c,v 1.28 2015/01/09 05:01:56 tedu Exp $ */ +/* $OpenBSD: cd9660_node.c,v 1.29 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: cd9660_node.c,v 1.17 1997/05/05 07:13:57 mycroft Exp $ */ /*- @@ -54,7 +54,6 @@ #include <isofs/cd9660/iso.h> #include <isofs/cd9660/cd9660_extern.h> #include <isofs/cd9660/cd9660_node.h> -#include <isofs/cd9660/iso_rrip.h> /* * Structures associated with iso_node caching. diff --git a/sys/isofs/cd9660/cd9660_rrip.c b/sys/isofs/cd9660/cd9660_rrip.c index cdcc1fb5809..8f3bcb2fcd4 100644 --- a/sys/isofs/cd9660/cd9660_rrip.c +++ b/sys/isofs/cd9660/cd9660_rrip.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd9660_rrip.c,v 1.12 2014/12/16 18:30:03 tedu Exp $ */ +/* $OpenBSD: cd9660_rrip.c,v 1.13 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: cd9660_rrip.c,v 1.17 1997/01/24 00:27:32 cgd Exp $ */ /*- @@ -41,7 +41,6 @@ #include <sys/systm.h> #include <sys/namei.h> #include <sys/buf.h> -#include <sys/file.h> #include <sys/vnode.h> #include <sys/lock.h> #include <sys/mount.h> diff --git a/sys/isofs/cd9660/cd9660_util.c b/sys/isofs/cd9660/cd9660_util.c index 77fab975920..fad78462699 100644 --- a/sys/isofs/cd9660/cd9660_util.c +++ b/sys/isofs/cd9660/cd9660_util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd9660_util.c,v 1.8 2014/09/14 14:17:25 jsg Exp $ */ +/* $OpenBSD: cd9660_util.c,v 1.9 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: cd9660_util.c,v 1.12 1997/01/24 00:27:33 cgd Exp $ */ /*- @@ -53,7 +53,6 @@ #include <sys/dirent.h> #include <isofs/cd9660/iso.h> -#include <isofs/cd9660/cd9660_extern.h> /* * XXX: limited support for loading of Unicode diff --git a/sys/isofs/cd9660/cd9660_vfsops.c b/sys/isofs/cd9660/cd9660_vfsops.c index 06d49848a17..b087fdea3fd 100644 --- a/sys/isofs/cd9660/cd9660_vfsops.c +++ b/sys/isofs/cd9660/cd9660_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd9660_vfsops.c,v 1.69 2014/12/16 18:30:03 tedu Exp $ */ +/* $OpenBSD: cd9660_vfsops.c,v 1.70 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: cd9660_vfsops.c,v 1.26 1997/06/13 15:38:58 pk Exp $ */ /*- @@ -51,7 +51,6 @@ #include <sys/disklabel.h> #include <sys/ioctl.h> #include <sys/cdio.h> -#include <sys/conf.h> #include <sys/errno.h> #include <sys/malloc.h> #include <sys/stat.h> diff --git a/sys/isofs/cd9660/cd9660_vnops.c b/sys/isofs/cd9660/cd9660_vnops.c index 00c0b30c987..07ea2531a69 100644 --- a/sys/isofs/cd9660/cd9660_vnops.c +++ b/sys/isofs/cd9660/cd9660_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd9660_vnops.c,v 1.70 2015/02/10 21:56:09 miod Exp $ */ +/* $OpenBSD: cd9660_vnops.c,v 1.71 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: cd9660_vnops.c,v 1.42 1997/10/16 23:56:57 christos Exp $ */ /*- @@ -54,7 +54,6 @@ #include <sys/dirent.h> #include <sys/ioctl.h> #include <sys/ioccom.h> -#include <sys/cdio.h> #include <sys/poll.h> #include <sys/specdev.h> #include <sys/unistd.h> diff --git a/sys/isofs/udf/udf_vfsops.c b/sys/isofs/udf/udf_vfsops.c index 91c94685fe5..ac9ebe491c0 100644 --- a/sys/isofs/udf/udf_vfsops.c +++ b/sys/isofs/udf/udf_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: udf_vfsops.c,v 1.44 2014/12/16 18:30:03 tedu Exp $ */ +/* $OpenBSD: udf_vfsops.c,v 1.45 2015/03/14 03:38:50 jsg Exp $ */ /* * Copyright (c) 2001, 2002 Scott Long <scottl@freebsd.org> @@ -51,7 +51,6 @@ #include <sys/systm.h> #include <sys/uio.h> #include <sys/buf.h> -#include <sys/conf.h> #include <sys/dirent.h> #include <sys/fcntl.h> #include <sys/kernel.h> diff --git a/sys/isofs/udf/udf_vnops.c b/sys/isofs/udf/udf_vnops.c index f838f18d255..14ae489eae2 100644 --- a/sys/isofs/udf/udf_vnops.c +++ b/sys/isofs/udf/udf_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: udf_vnops.c,v 1.59 2015/02/10 21:56:09 miod Exp $ */ +/* $OpenBSD: udf_vnops.c,v 1.60 2015/03/14 03:38:50 jsg Exp $ */ /* * Copyright (c) 2001, 2002 Scott Long <scottl@freebsd.org> @@ -35,7 +35,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/namei.h> -#include <sys/kernel.h> #include <sys/malloc.h> #include <sys/mutex.h> #include <sys/stat.h> diff --git a/sys/kern/clock_subr.c b/sys/kern/clock_subr.c index 8bb8cd4030a..7b07e214c8b 100644 --- a/sys/kern/clock_subr.c +++ b/sys/kern/clock_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clock_subr.c,v 1.4 2014/04/03 22:19:27 tedu Exp $ */ +/* $OpenBSD: clock_subr.c,v 1.5 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: clock_subr.c,v 1.3 1997/03/15 18:11:16 is Exp $ */ /* @@ -48,8 +48,6 @@ #include <sys/types.h> #include <sys/systm.h> -#include <dev/clock_subr.h> - static inline int leapyear(int year); #define FEBRUARY 2 #define days_in_year(a) (leapyear(a) ? 366 : 365) diff --git a/sys/kern/exec_script.c b/sys/kern/exec_script.c index d7af095f23b..461ce29007a 100644 --- a/sys/kern/exec_script.c +++ b/sys/kern/exec_script.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec_script.c,v 1.34 2014/12/16 18:30:03 tedu Exp $ */ +/* $OpenBSD: exec_script.c,v 1.35 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: exec_script.c,v 1.13 1996/02/04 02:15:06 christos Exp $ */ /* @@ -42,7 +42,6 @@ #include <sys/file.h> #include <sys/filedesc.h> #include <sys/exec.h> -#include <sys/resourcevar.h> #include <sys/exec_script.h> diff --git a/sys/kern/exec_subr.c b/sys/kern/exec_subr.c index 17ff312c3db..e2c59a1424c 100644 --- a/sys/kern/exec_subr.c +++ b/sys/kern/exec_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec_subr.c,v 1.49 2015/02/16 05:23:43 miod Exp $ */ +/* $OpenBSD: exec_subr.c,v 1.50 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: exec_subr.c,v 1.9 1994/12/04 03:10:42 mycroft Exp $ */ /* @@ -36,7 +36,6 @@ #include <sys/proc.h> #include <sys/malloc.h> #include <sys/vnode.h> -#include <sys/filedesc.h> #include <sys/exec.h> #include <sys/mman.h> #include <sys/resourcevar.h> diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c index 85c449eb35c..d7b5dc29bd9 100644 --- a/sys/kern/init_sysent.c +++ b/sys/kern/init_sysent.c @@ -1,4 +1,4 @@ -/* $OpenBSD: init_sysent.c,v 1.164 2015/02/09 13:55:04 deraadt Exp $ */ +/* $OpenBSD: init_sysent.c,v 1.165 2015/03/14 03:38:50 jsg Exp $ */ /* * System call switch table. @@ -13,7 +13,6 @@ #include <sys/mount.h> #include <sys/syscallargs.h> #include <sys/poll.h> -#include <sys/event.h> #define s(type) sizeof(type) diff --git a/sys/kern/kern_bufq.c b/sys/kern/kern_bufq.c index 4cba9f146b2..d819783f268 100644 --- a/sys/kern/kern_bufq.c +++ b/sys/kern/kern_bufq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_bufq.c,v 1.29 2015/01/09 05:04:22 tedu Exp $ */ +/* $OpenBSD: kern_bufq.c,v 1.30 2015/03/14 03:38:50 jsg Exp $ */ /* * Copyright (c) 2010 Thordur I. Bjornsson <thib@openbsd.org> * Copyright (c) 2010 David Gwynne <dlg@openbsd.org> @@ -26,8 +26,6 @@ #include <sys/errno.h> #include <sys/queue.h> -#include <sys/disklabel.h> - SLIST_HEAD(, bufq) bufqs = SLIST_HEAD_INITIALIZER(bufqs); struct mutex bufqs_mtx = MUTEX_INITIALIZER(IPL_NONE); int bufqs_stop; diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 0990561098f..2b55a32e7c1 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_descrip.c,v 1.116 2015/01/19 01:19:17 deraadt Exp $ */ +/* $OpenBSD: kern_descrip.c,v 1.117 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: kern_descrip.c,v 1.42 1996/03/30 22:24:38 christos Exp $ */ /* @@ -55,7 +55,6 @@ #include <sys/ucred.h> #include <sys/unistd.h> #include <sys/resourcevar.h> -#include <sys/conf.h> #include <sys/mount.h> #include <sys/syscallargs.h> #include <sys/event.h> diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index 6fb62d18305..0ff4c2cb126 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_exec.c,v 1.160 2015/02/09 11:52:47 miod Exp $ */ +/* $OpenBSD: kern_exec.c,v 1.161 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: kern_exec.c,v 1.75 1996/02/09 18:59:28 christos Exp $ */ /*- @@ -61,8 +61,6 @@ #include <uvm/uvm_extern.h> -#include <machine/reg.h> - #ifdef __HAVE_MD_TCB # include <machine/tcb.h> #endif diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index 829a7291448..ab9b157fc09 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_exit.c,v 1.148 2014/12/16 18:30:04 tedu Exp $ */ +/* $OpenBSD: kern_exit.c,v 1.149 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: kern_exit.c,v 1.39 1996/04/22 01:38:25 christos Exp $ */ /* @@ -46,7 +46,6 @@ #include <sys/resource.h> #include <sys/kernel.h> #include <sys/sysctl.h> -#include <sys/buf.h> #include <sys/wait.h> #include <sys/file.h> #include <sys/vnode.h> diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index 85439b05065..30c65f5ee1a 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_fork.c,v 1.178 2015/02/10 05:28:18 guenther Exp $ */ +/* $OpenBSD: kern_fork.c,v 1.179 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: kern_fork.c,v 1.29 1996/02/09 18:59:34 christos Exp $ */ /* @@ -57,7 +57,6 @@ #include <sys/pool.h> #include <sys/mman.h> #include <sys/ptrace.h> -#include <sys/atomic.h> #include <sys/unistd.h> #include <sys/syscallargs.h> diff --git a/sys/kern/kern_kthread.c b/sys/kern/kern_kthread.c index 7166ed57c40..7b8ea85bbba 100644 --- a/sys/kern/kern_kthread.c +++ b/sys/kern/kern_kthread.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_kthread.c,v 1.37 2014/11/03 03:08:00 deraadt Exp $ */ +/* $OpenBSD: kern_kthread.c,v 1.38 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: kern_kthread.c,v 1.3 1998/12/22 21:21:36 kleink Exp $ */ /*- @@ -33,7 +33,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/kthread.h> #include <sys/proc.h> #include <sys/wait.h> diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c index 80dc4150bb8..eb3f62fb99a 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_malloc.c,v 1.127 2015/02/13 13:35:03 millert Exp $ */ +/* $OpenBSD: kern_malloc.c,v 1.128 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: kern_malloc.c,v 1.15.4.2 1996/06/13 17:10:56 cgd Exp $ */ /* @@ -668,7 +668,6 @@ malloc_roundup(size_t sz) #if defined(DDB) #include <machine/db_machdep.h> -#include <ddb/db_interface.h> #include <ddb/db_output.h> void diff --git a/sys/kern/kern_physio.c b/sys/kern/kern_physio.c index 338a4fba936..7c7bc6d960a 100644 --- a/sys/kern/kern_physio.c +++ b/sys/kern/kern_physio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_physio.c,v 1.42 2014/11/16 12:31:00 deraadt Exp $ */ +/* $OpenBSD: kern_physio.c,v 1.43 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: kern_physio.c,v 1.28 1997/05/19 10:43:28 pk Exp $ */ /*- @@ -41,7 +41,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/buf.h> -#include <sys/conf.h> #include <sys/pool.h> #include <uvm/uvm_extern.h> diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 87fc1017a08..59a979e5ed2 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_proc.c,v 1.63 2014/12/19 05:59:21 tedu Exp $ */ +/* $OpenBSD: kern_proc.c,v 1.64 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: kern_proc.c,v 1.14 1996/02/09 18:59:41 christos Exp $ */ /* @@ -410,7 +410,6 @@ proc_printit(struct proc *p, const char *modif, } #include <machine/db_machdep.h> -#include <ddb/db_interface.h> #include <ddb/db_output.h> void diff --git a/sys/kern/kern_rwlock.c b/sys/kern/kern_rwlock.c index 3ad22be632a..ab75143ddc0 100644 --- a/sys/kern/kern_rwlock.c +++ b/sys/kern/kern_rwlock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_rwlock.c,v 1.25 2015/02/11 00:14:11 dlg Exp $ */ +/* $OpenBSD: kern_rwlock.c,v 1.26 2015/03/14 03:38:50 jsg Exp $ */ /* * Copyright (c) 2002, 2003 Artur Grabowski <art@openbsd.org> @@ -22,7 +22,6 @@ #include <sys/proc.h> #include <sys/rwlock.h> #include <sys/limits.h> -#include <sys/atomic.h> /* XXX - temporary measure until proc0 is properly aligned */ #define RW_PROC(p) (((long)p) & ~RWLOCK_MASK) diff --git a/sys/kern/kern_sched.c b/sys/kern/kern_sched.c index 25070550765..1382840d3f8 100644 --- a/sys/kern/kern_sched.c +++ b/sys/kern/kern_sched.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_sched.c,v 1.35 2014/09/24 09:13:20 mpi Exp $ */ +/* $OpenBSD: kern_sched.c,v 1.36 2015/03/14 03:38:50 jsg Exp $ */ /* * Copyright (c) 2007, 2008 Artur Grabowski <art@openbsd.org> * @@ -27,9 +27,6 @@ #include <uvm/uvm_extern.h> -#include <sys/malloc.h> - - void sched_kthreads_create(void *); int sched_proc_to_cpu_cost(struct cpu_info *ci, struct proc *p); diff --git a/sys/kern/kern_sensors.c b/sys/kern/kern_sensors.c index 332fb6103fc..5e6c68ad0c5 100644 --- a/sys/kern/kern_sensors.c +++ b/sys/kern/kern_sensors.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_sensors.c,v 1.35 2015/02/09 03:15:41 dlg Exp $ */ +/* $OpenBSD: kern_sensors.c,v 1.36 2015/03/14 03:38:50 jsg Exp $ */ /* * Copyright (c) 2005 David Gwynne <dlg@openbsd.org> @@ -19,7 +19,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/malloc.h> #include <sys/queue.h> #include <sys/device.h> diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index 761502cb24e..fe9e4c58cae 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_sig.c,v 1.178 2015/02/09 13:41:24 pelikan Exp $ */ +/* $OpenBSD: kern_sig.c,v 1.179 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: kern_sig.c,v 1.54 1996/04/22 01:38:32 christos Exp $ */ /* @@ -48,7 +48,6 @@ #include <sys/event.h> #include <sys/proc.h> #include <sys/systm.h> -#include <sys/buf.h> #include <sys/acct.h> #include <sys/file.h> #include <sys/filedesc.h> diff --git a/sys/kern/kern_subr.c b/sys/kern/kern_subr.c index 71ec338632c..c236b9fb4ca 100644 --- a/sys/kern/kern_subr.c +++ b/sys/kern/kern_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_subr.c,v 1.43 2015/02/10 21:56:09 miod Exp $ */ +/* $OpenBSD: kern_subr.c,v 1.44 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: kern_subr.c,v 1.15 1996/04/09 17:21:56 ragge Exp $ */ /* @@ -43,7 +43,6 @@ #include <sys/sched.h> #include <sys/malloc.h> #include <sys/queue.h> -#include <sys/kernel.h> #include <sys/resourcevar.h> int diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c index 46728c7715a..d5efc750c48 100644 --- a/sys/kern/kern_synch.c +++ b/sys/kern/kern_synch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_synch.c,v 1.118 2015/02/10 03:40:18 blambert Exp $ */ +/* $OpenBSD: kern_synch.c,v 1.119 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: kern_synch.c,v 1.37 1996/04/22 01:38:37 christos Exp $ */ /* @@ -41,7 +41,6 @@ #include <sys/systm.h> #include <sys/proc.h> #include <sys/kernel.h> -#include <sys/buf.h> #include <sys/signalvar.h> #include <sys/resourcevar.h> #include <sys/sched.h> diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c index 18968781fa2..e4a943fbc7f 100644 --- a/sys/kern/kern_timeout.c +++ b/sys/kern/kern_timeout.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_timeout.c,v 1.41 2013/11/27 04:28:32 dlg Exp $ */ +/* $OpenBSD: kern_timeout.c,v 1.42 2015/03/14 03:38:50 jsg Exp $ */ /* * Copyright (c) 2001 Thomas Nordin <nordin@openbsd.org> * Copyright (c) 2000-2001 Artur Grabowski <art@openbsd.org> @@ -36,7 +36,6 @@ #ifdef DDB #include <machine/db_machdep.h> #include <ddb/db_interface.h> -#include <ddb/db_access.h> #include <ddb/db_sym.h> #include <ddb/db_output.h> #endif diff --git a/sys/kern/kern_xxx.c b/sys/kern/kern_xxx.c index d898dbe7a46..7ad560b3144 100644 --- a/sys/kern/kern_xxx.c +++ b/sys/kern/kern_xxx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_xxx.c,v 1.27 2014/09/14 14:17:25 jsg Exp $ */ +/* $OpenBSD: kern_xxx.c,v 1.28 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: kern_xxx.c,v 1.32 1996/04/22 01:38:41 christos Exp $ */ /* @@ -40,8 +40,6 @@ #include <sys/mount.h> #include <sys/syscallargs.h> -#include <net/if.h> - /* ARGSUSED */ int sys_reboot(struct proc *p, void *v, register_t *retval) diff --git a/sys/kern/sched_bsd.c b/sys/kern/sched_bsd.c index 3472681590f..abd92fd4b8d 100644 --- a/sys/kern/sched_bsd.c +++ b/sys/kern/sched_bsd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sched_bsd.c,v 1.40 2014/12/13 21:05:33 doug Exp $ */ +/* $OpenBSD: sched_bsd.c,v 1.41 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: kern_synch.c,v 1.37 1996/04/22 01:38:37 christos Exp $ */ /*- @@ -42,7 +42,6 @@ #include <sys/proc.h> #include <sys/kernel.h> #include <sys/malloc.h> -#include <sys/buf.h> #include <sys/signalvar.h> #include <sys/resourcevar.h> #include <uvm/uvm_extern.h> diff --git a/sys/kern/subr_autoconf.c b/sys/kern/subr_autoconf.c index 96178d8ea67..b85082beebc 100644 --- a/sys/kern/subr_autoconf.c +++ b/sys/kern/subr_autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_autoconf.c,v 1.86 2015/02/09 13:38:50 dlg Exp $ */ +/* $OpenBSD: subr_autoconf.c,v 1.87 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: subr_autoconf.c,v 1.21 1996/04/04 06:06:18 cgd Exp $ */ /* @@ -46,7 +46,6 @@ #include <sys/param.h> #include <sys/device.h> #include <sys/hotplug.h> -#include <sys/limits.h> #include <sys/malloc.h> #include <sys/systm.h> #include <sys/queue.h> diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c index 7aafad75b94..a946f386083 100644 --- a/sys/kern/subr_disk.c +++ b/sys/kern/subr_disk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_disk.c,v 1.180 2015/01/27 03:17:36 dlg Exp $ */ +/* $OpenBSD: subr_disk.c,v 1.181 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: subr_disk.c,v 1.17 1996/03/16 23:17:08 christos Exp $ */ /* @@ -65,8 +65,6 @@ #include <dev/rndvar.h> #include <dev/cons.h> -#include <lib/libz/zlib.h> - #include "softraid.h" #ifdef DEBUG diff --git a/sys/kern/subr_evcount.c b/sys/kern/subr_evcount.c index 4696dee23ef..ea737fae608 100644 --- a/sys/kern/subr_evcount.c +++ b/sys/kern/subr_evcount.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_evcount.c,v 1.11 2014/09/14 14:17:25 jsg Exp $ */ +/* $OpenBSD: subr_evcount.c,v 1.12 2015/03/14 03:38:50 jsg Exp $ */ /* * Copyright (c) 2004 Artur Grabowski <art@openbsd.org> * Copyright (c) 2004 Aaron Campbell <aaron@openbsd.org> @@ -28,7 +28,6 @@ #include <sys/param.h> #include <sys/evcount.h> #include <sys/timeout.h> -#include <sys/kernel.h> #include <sys/systm.h> #include <sys/sysctl.h> diff --git a/sys/kern/subr_extent.c b/sys/kern/subr_extent.c index 169b3550e2f..dd6645068e2 100644 --- a/sys/kern/subr_extent.c +++ b/sys/kern/subr_extent.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_extent.c,v 1.55 2014/11/03 03:08:00 deraadt Exp $ */ +/* $OpenBSD: subr_extent.c,v 1.56 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: subr_extent.c,v 1.7 1996/11/21 18:46:34 cgd Exp $ */ /*- @@ -38,7 +38,6 @@ #include <sys/param.h> #include <sys/extent.h> #include <sys/malloc.h> -#include <sys/time.h> #include <sys/systm.h> #include <sys/queue.h> #include <sys/pool.h> diff --git a/sys/kern/subr_log.c b/sys/kern/subr_log.c index dbae2898ac7..b8c257b7ec0 100644 --- a/sys/kern/subr_log.c +++ b/sys/kern/subr_log.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_log.c,v 1.28 2015/02/10 21:56:09 miod Exp $ */ +/* $OpenBSD: subr_log.c,v 1.29 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: subr_log.c,v 1.11 1996/03/30 22:24:44 christos Exp $ */ /* @@ -45,7 +45,6 @@ #include <sys/file.h> #include <sys/signalvar.h> #include <sys/syslog.h> -#include <sys/conf.h> #include <sys/poll.h> #include <sys/malloc.h> #include <sys/filedesc.h> diff --git a/sys/kern/subr_poison.c b/sys/kern/subr_poison.c index 95a4f87b77a..5de436e13f8 100644 --- a/sys/kern/subr_poison.c +++ b/sys/kern/subr_poison.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_poison.c,v 1.12 2014/09/27 12:23:41 tedu Exp $ */ +/* $OpenBSD: subr_poison.c,v 1.13 2015/03/14 03:38:50 jsg Exp $ */ /* * Copyright (c) 2013 Ted Unangst <tedu@openbsd.org> * @@ -17,7 +17,6 @@ #include <sys/types.h> #include <sys/param.h> -#include <sys/malloc.h> #include <uvm/uvm_extern.h> diff --git a/sys/kern/subr_pool.c b/sys/kern/subr_pool.c index 62027d7d8e3..3e90589752d 100644 --- a/sys/kern/subr_pool.c +++ b/sys/kern/subr_pool.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_pool.c,v 1.180 2015/02/10 06:16:13 dlg Exp $ */ +/* $OpenBSD: subr_pool.c,v 1.181 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: subr_pool.c,v 1.61 2001/09/26 07:14:56 chs Exp $ */ /*- @@ -991,7 +991,6 @@ pool_reclaim_all(void) #ifdef DDB #include <machine/db_machdep.h> -#include <ddb/db_interface.h> #include <ddb/db_output.h> /* diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c index 06f2cc60161..278487fe773 100644 --- a/sys/kern/subr_prf.c +++ b/sys/kern/subr_prf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_prf.c,v 1.84 2015/01/13 10:07:58 mpf Exp $ */ +/* $OpenBSD: subr_prf.c,v 1.85 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: subr_prf.c,v 1.45 1997/10/24 18:14:25 chuck Exp $ */ /*- @@ -39,7 +39,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/buf.h> #include <sys/conf.h> #include <sys/reboot.h> #include <sys/msgbuf.h> diff --git a/sys/kern/subr_prof.c b/sys/kern/subr_prof.c index eeeaa3e9cfc..1e2194fa4c8 100644 --- a/sys/kern/subr_prof.c +++ b/sys/kern/subr_prof.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_prof.c,v 1.27 2014/08/30 08:48:23 mpi Exp $ */ +/* $OpenBSD: subr_prof.c,v 1.28 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: subr_prof.c,v 1.12 1996/04/22 01:38:50 christos Exp $ */ /*- @@ -34,7 +34,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/proc.h> #include <sys/resourcevar.h> #include <sys/mount.h> diff --git a/sys/kern/subr_xxx.c b/sys/kern/subr_xxx.c index f533b77c49e..09b43513401 100644 --- a/sys/kern/subr_xxx.c +++ b/sys/kern/subr_xxx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_xxx.c,v 1.13 2013/03/28 16:55:25 deraadt Exp $ */ +/* $OpenBSD: subr_xxx.c,v 1.14 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: subr_xxx.c,v 1.10 1996/02/04 02:16:51 christos Exp $ */ /* @@ -38,7 +38,6 @@ */ #include <sys/param.h> #include <sys/systm.h> -#include <sys/device.h> #include <sys/conf.h> diff --git a/sys/kern/sysv_ipc.c b/sys/kern/sysv_ipc.c index a644bc4ed00..6933262a0ee 100644 --- a/sys/kern/sysv_ipc.c +++ b/sys/kern/sysv_ipc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sysv_ipc.c,v 1.7 2014/09/14 14:17:25 jsg Exp $ */ +/* $OpenBSD: sysv_ipc.c,v 1.8 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: sysv_ipc.c,v 1.10 1995/06/03 05:53:28 mycroft Exp $ */ /* @@ -31,7 +31,6 @@ */ #include <sys/param.h> -#include <sys/kernel.h> #include <sys/ipc.h> #include <sys/systm.h> #include <sys/mount.h> diff --git a/sys/kern/sysv_sem.c b/sys/kern/sysv_sem.c index ca1325f0130..62e97e3dcbf 100644 --- a/sys/kern/sysv_sem.c +++ b/sys/kern/sysv_sem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sysv_sem.c,v 1.52 2014/12/19 05:59:21 tedu Exp $ */ +/* $OpenBSD: sysv_sem.c,v 1.53 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: sysv_sem.c,v 1.26 1996/02/09 19:00:25 christos Exp $ */ /* @@ -30,7 +30,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/proc.h> #include <sys/sem.h> #include <sys/sysctl.h> diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c index c41c8687b6b..b815ff457bc 100644 --- a/sys/kern/sysv_shm.c +++ b/sys/kern/sysv_shm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sysv_shm.c,v 1.65 2015/01/15 20:36:17 millert Exp $ */ +/* $OpenBSD: sysv_shm.c,v 1.66 2015/03/14 03:38:50 jsg Exp $ */ /* $NetBSD: sysv_shm.c,v 1.50 1998/10/21 22:24:29 tron Exp $ */ /* @@ -51,7 +51,6 @@ */ #include <sys/param.h> -#include <sys/kernel.h> #include <sys/shm.h> #include <sys/proc.h> #include <sys/uio.h> diff --git a/sys/kern/tty_conf.c b/sys/kern/tty_conf.c index 2f0ec182f97..ed8a76d4680 100644 --- a/sys/kern/tty_conf.c +++ b/sys/kern/tty_conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tty_conf.c,v 1.20 2014/10/01 10:08:30 mpi Exp $ */ +/* $OpenBSD: tty_conf.c,v 1.21 2015/03/14 03:38:51 jsg Exp $ */ /* $NetBSD: tty_conf.c,v 1.18 1996/05/19 17:17:55 jonathan Exp $ */ /*- @@ -39,7 +39,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/ioctl.h> #include <sys/tty.h> #include <sys/conf.h> diff --git a/sys/kern/tty_subr.c b/sys/kern/tty_subr.c index d0c263f322c..4f41dbc4abb 100644 --- a/sys/kern/tty_subr.c +++ b/sys/kern/tty_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tty_subr.c,v 1.31 2014/12/10 02:44:47 tedu Exp $ */ +/* $OpenBSD: tty_subr.c,v 1.32 2015/03/14 03:38:51 jsg Exp $ */ /* $NetBSD: tty_subr.c,v 1.13 1996/02/09 19:00:43 christos Exp $ */ /* @@ -31,7 +31,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/buf.h> #include <sys/ioctl.h> #include <sys/tty.h> #include <sys/malloc.h> diff --git a/sys/kern/tty_tty.c b/sys/kern/tty_tty.c index ec3b20d5f78..2ad0003f890 100644 --- a/sys/kern/tty_tty.c +++ b/sys/kern/tty_tty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tty_tty.c,v 1.13 2014/12/16 18:30:04 tedu Exp $ */ +/* $OpenBSD: tty_tty.c,v 1.14 2015/03/14 03:38:51 jsg Exp $ */ /* $NetBSD: tty_tty.c,v 1.13 1996/03/30 22:24:46 christos Exp $ */ /*- @@ -43,7 +43,6 @@ #include <sys/vnode.h> #include <sys/lock.h> #include <sys/file.h> -#include <sys/conf.h> #define cttyvp(p) \ diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c index 44e610d69db..5ec1a8d3c1c 100644 --- a/sys/kern/uipc_domain.c +++ b/sys/kern/uipc_domain.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_domain.c,v 1.39 2014/12/23 03:26:24 tedu Exp $ */ +/* $OpenBSD: uipc_domain.c,v 1.40 2015/03/14 03:38:51 jsg Exp $ */ /* $NetBSD: uipc_domain.c,v 1.14 1996/02/09 19:00:44 christos Exp $ */ /* @@ -38,7 +38,6 @@ #include <sys/domain.h> #include <sys/mbuf.h> #include <sys/time.h> -#include <sys/kernel.h> #include <sys/systm.h> #include <sys/sysctl.h> #include <sys/timeout.h> diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c index c17c810b36f..eb01ae9a8f0 100644 --- a/sys/kern/uipc_mbuf.c +++ b/sys/kern/uipc_mbuf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_mbuf.c,v 1.201 2015/02/07 02:52:09 dlg Exp $ */ +/* $OpenBSD: uipc_mbuf.c,v 1.202 2015/03/14 03:38:51 jsg Exp $ */ /* $NetBSD: uipc_mbuf.c,v 1.15.4.1 1996/06/13 17:11:44 cgd Exp $ */ /* @@ -91,7 +91,6 @@ #ifdef DDB #include <machine/db_machdep.h> -#include <ddb/db_interface.h> #endif struct mbstat mbstat; /* mbuf stats */ diff --git a/sys/kern/uipc_proto.c b/sys/kern/uipc_proto.c index 6c99536f6ed..6e7529e8366 100644 --- a/sys/kern/uipc_proto.c +++ b/sys/kern/uipc_proto.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_proto.c,v 1.6 2011/07/06 06:31:38 matthew Exp $ */ +/* $OpenBSD: uipc_proto.c,v 1.7 2015/03/14 03:38:51 jsg Exp $ */ /* $NetBSD: uipc_proto.c,v 1.8 1996/02/13 21:10:47 christos Exp $ */ /*- @@ -40,7 +40,6 @@ #include <sys/un.h> #include <sys/socketvar.h> -#include <net/if.h> #include <net/raw_cb.h> /* diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index e7a1f94addb..08d8e061a8b 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_socket.c,v 1.136 2015/02/10 21:56:10 miod Exp $ */ +/* $OpenBSD: uipc_socket.c,v 1.137 2015/03/14 03:38:51 jsg Exp $ */ /* $NetBSD: uipc_socket.c,v 1.21 1996/02/04 02:17:52 christos Exp $ */ /* @@ -47,7 +47,6 @@ #include <sys/unpcb.h> #include <sys/socketvar.h> #include <sys/signalvar.h> -#include <sys/resourcevar.h> #include <net/if.h> #include <sys/pool.h> diff --git a/sys/kern/uipc_socket2.c b/sys/kern/uipc_socket2.c index 9df9383e848..eb6c7ee6bf1 100644 --- a/sys/kern/uipc_socket2.c +++ b/sys/kern/uipc_socket2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_socket2.c,v 1.59 2014/12/11 19:21:57 tedu Exp $ */ +/* $OpenBSD: uipc_socket2.c,v 1.60 2015/03/14 03:38:51 jsg Exp $ */ /* $NetBSD: uipc_socket2.c,v 1.11 1996/02/04 02:17:55 christos Exp $ */ /* @@ -35,7 +35,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/file.h> -#include <sys/buf.h> #include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/protosw.h> diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index 1d5a7aecd6e..6795fd42f78 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_syscalls.c,v 1.99 2015/01/19 19:57:59 guenther Exp $ */ +/* $OpenBSD: uipc_syscalls.c,v 1.100 2015/03/14 03:38:51 jsg Exp $ */ /* $NetBSD: uipc_syscalls.c,v 1.19 1996/02/09 19:00:48 christos Exp $ */ /* @@ -38,7 +38,6 @@ #include <sys/proc.h> #include <sys/file.h> #include <sys/ioctl.h> -#include <sys/buf.h> #include <sys/malloc.h> #include <sys/event.h> #include <sys/mbuf.h> diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 5611c6be390..b08300e01a6 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_bio.c,v 1.168 2015/02/07 08:21:24 miod Exp $ */ +/* $OpenBSD: vfs_bio.c,v 1.169 2015/03/14 03:38:51 jsg Exp $ */ /* $NetBSD: vfs_bio.c,v 1.44 1996/06/11 11:15:36 pk Exp $ */ /* @@ -57,11 +57,6 @@ #include <sys/conf.h> #include <sys/kernel.h> #include <sys/specdev.h> - -#ifdef HIBERNATE -#include <sys/hibernate.h> -#endif /* HIBERNATE */ - #include <uvm/uvm_extern.h> int nobuffers; diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index 99f07b5e4d7..5429e87e424 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_cache.c,v 1.46 2015/01/28 20:16:04 tedu Exp $ */ +/* $OpenBSD: vfs_cache.c,v 1.47 2015/03/14 03:38:51 jsg Exp $ */ /* $NetBSD: vfs_cache.c,v 1.13 1996/02/04 02:18:09 christos Exp $ */ /* @@ -40,7 +40,6 @@ #include <sys/lock.h> #include <sys/namei.h> #include <sys/errno.h> -#include <sys/malloc.h> #include <sys/pool.h> /* diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c index cc40dfdda34..951bc9a5a01 100644 --- a/sys/kern/vfs_cluster.c +++ b/sys/kern/vfs_cluster.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_cluster.c,v 1.43 2014/09/14 14:17:26 jsg Exp $ */ +/* $OpenBSD: vfs_cluster.c,v 1.44 2015/03/14 03:38:51 jsg Exp $ */ /* $NetBSD: vfs_cluster.c,v 1.12 1996/04/22 01:39:05 christos Exp $ */ /* @@ -38,7 +38,6 @@ #include <sys/mount.h> #include <sys/malloc.h> #include <sys/systm.h> -#include <sys/resourcevar.h> void cluster_wbuild(struct vnode *, struct buf *, long, daddr_t, int, daddr_t); diff --git a/sys/kern/vfs_default.c b/sys/kern/vfs_default.c index c5dfe6735c5..26a61dbe516 100644 --- a/sys/kern/vfs_default.c +++ b/sys/kern/vfs_default.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_default.c,v 1.40 2014/09/14 14:17:26 jsg Exp $ */ +/* $OpenBSD: vfs_default.c,v 1.41 2015/03/14 03:38:51 jsg Exp $ */ /* * Portions of this code are: @@ -41,7 +41,6 @@ #include <sys/mount.h> #include <sys/vnode.h> #include <sys/namei.h> -#include <sys/malloc.h> #include <sys/pool.h> #include <sys/event.h> #include <sys/specdev.h> diff --git a/sys/kern/vfs_getcwd.c b/sys/kern/vfs_getcwd.c index 739301923f2..818718a8e97 100644 --- a/sys/kern/vfs_getcwd.c +++ b/sys/kern/vfs_getcwd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_getcwd.c,v 1.24 2014/12/16 18:30:04 tedu Exp $ */ +/* $OpenBSD: vfs_getcwd.c,v 1.25 2015/03/14 03:38:51 jsg Exp $ */ /* $NetBSD: vfs_getcwd.c,v 1.3.2.3 1999/07/11 10:24:09 sommerfeld Exp $ */ /* @@ -35,7 +35,6 @@ #include <sys/namei.h> #include <sys/filedesc.h> #include <sys/kernel.h> -#include <sys/file.h> #include <sys/stat.h> #include <sys/lock.h> #include <sys/vnode.h> diff --git a/sys/kern/vfs_init.c b/sys/kern/vfs_init.c index 02a58dc7924..cd3b9b53c0a 100644 --- a/sys/kern/vfs_init.c +++ b/sys/kern/vfs_init.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_init.c,v 1.35 2014/12/19 05:59:21 tedu Exp $ */ +/* $OpenBSD: vfs_init.c,v 1.36 2015/03/14 03:38:51 jsg Exp $ */ /* $NetBSD: vfs_init.c,v 1.6 1996/02/09 19:00:58 christos Exp $ */ /* @@ -41,7 +41,6 @@ #include <sys/mount.h> #include <sys/namei.h> #include <sys/vnode.h> -#include <sys/systm.h> #include <sys/pool.h> struct pool namei_pool; diff --git a/sys/kern/vfs_lockf.c b/sys/kern/vfs_lockf.c index 91db278f1d5..6749d956dd0 100644 --- a/sys/kern/vfs_lockf.c +++ b/sys/kern/vfs_lockf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_lockf.c,v 1.19 2014/12/19 05:59:21 tedu Exp $ */ +/* $OpenBSD: vfs_lockf.c,v 1.20 2015/03/14 03:38:51 jsg Exp $ */ /* $NetBSD: vfs_lockf.c,v 1.7 1996/02/04 02:18:21 christos Exp $ */ /* @@ -38,7 +38,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> -#include <sys/file.h> #include <sys/proc.h> #include <sys/vnode.h> #include <sys/pool.h> diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c index f48e2601b80..9f7eae22f75 100644 --- a/sys/kern/vfs_lookup.c +++ b/sys/kern/vfs_lookup.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_lookup.c,v 1.51 2015/01/19 18:05:41 deraadt Exp $ */ +/* $OpenBSD: vfs_lookup.c,v 1.52 2015/03/14 03:38:51 jsg Exp $ */ /* $NetBSD: vfs_lookup.c,v 1.17 1996/02/09 19:00:59 christos Exp $ */ /* @@ -46,7 +46,6 @@ #include <sys/lock.h> #include <sys/mount.h> #include <sys/errno.h> -#include <sys/malloc.h> #include <sys/pool.h> #include <sys/filedesc.h> #include <sys/proc.h> diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 1f8bf5b1a3c..1d02681e8a2 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_subr.c,v 1.229 2015/03/02 20:46:50 guenther Exp $ */ +/* $OpenBSD: vfs_subr.c,v 1.230 2015/03/14 03:38:51 jsg Exp $ */ /* $NetBSD: vfs_subr.c,v 1.53 1996/04/22 01:39:13 christos Exp $ */ /* @@ -2087,7 +2087,6 @@ vn_isdisk(struct vnode *vp, int *errp) #ifdef DDB #include <machine/db_machdep.h> #include <ddb/db_interface.h> -#include <ddb/db_output.h> void vfs_buf_print(void *b, int full, diff --git a/sys/kern/vfs_sync.c b/sys/kern/vfs_sync.c index fc1044da6f3..2f77f656b66 100644 --- a/sys/kern/vfs_sync.c +++ b/sys/kern/vfs_sync.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_sync.c,v 1.53 2014/12/16 18:30:04 tedu Exp $ */ +/* $OpenBSD: vfs_sync.c,v 1.54 2015/03/14 03:38:51 jsg Exp $ */ /* * Portions of this code are: @@ -47,7 +47,6 @@ #include <sys/mount.h> #include <sys/vnode.h> #include <sys/lock.h> -#include <sys/buf.h> #include <sys/malloc.h> #include <sys/kernel.h> diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 8cabaa149b0..99d45dafdb0 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_syscalls.c,v 1.216 2014/12/16 18:30:04 tedu Exp $ */ +/* $OpenBSD: vfs_syscalls.c,v 1.217 2015/03/14 03:38:51 jsg Exp $ */ /* $NetBSD: vfs_syscalls.c,v 1.71 1996/04/23 10:29:02 mycroft Exp $ */ /* @@ -52,7 +52,6 @@ #include <sys/uio.h> #include <sys/malloc.h> #include <sys/pool.h> -#include <sys/dirent.h> #include <sys/dkio.h> #include <sys/disklabel.h> #include <sys/ktrace.h> diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 1278779c09d..c874477ea1e 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_vnops.c,v 1.80 2014/12/16 18:30:04 tedu Exp $ */ +/* $OpenBSD: vfs_vnops.c,v 1.81 2015/03/14 03:38:51 jsg Exp $ */ /* $NetBSD: vfs_vnops.c,v 1.20 1996/02/04 02:18:41 christos Exp $ */ /* @@ -43,7 +43,6 @@ #include <sys/malloc.h> #include <sys/file.h> #include <sys/stat.h> -#include <sys/buf.h> #include <sys/proc.h> #include <sys/resourcevar.h> #include <sys/signalvar.h> diff --git a/sys/kern/vfs_vops.c b/sys/kern/vfs_vops.c index 53dde56a07e..8d761f10f58 100644 --- a/sys/kern/vfs_vops.c +++ b/sys/kern/vfs_vops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_vops.c,v 1.11 2015/01/19 20:16:27 guenther Exp $ */ +/* $OpenBSD: vfs_vops.c,v 1.12 2015/03/14 03:38:51 jsg Exp $ */ /* * Copyright (c) 2010 Thordur I. Bjornsson <thib@openbsd.org> * @@ -43,7 +43,6 @@ */ #include <sys/param.h> -#include <sys/mount.h> #include <sys/vnode.h> #include <sys/unistd.h> diff --git a/sys/lib/libz/zopenbsd.c b/sys/lib/libz/zopenbsd.c index 10d3845be67..9dbd0e94a44 100644 --- a/sys/lib/libz/zopenbsd.c +++ b/sys/lib/libz/zopenbsd.c @@ -1,6 +1,5 @@ #include <sys/types.h> #include <sys/malloc.h> -#include <lib/libz/zutil.h> /* * Space allocation and freeing routines for use by zlib routines. diff --git a/sys/miscfs/deadfs/dead_vnops.c b/sys/miscfs/deadfs/dead_vnops.c index b3610648ff7..bbbb8eedf88 100644 --- a/sys/miscfs/deadfs/dead_vnops.c +++ b/sys/miscfs/deadfs/dead_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dead_vnops.c,v 1.28 2014/12/16 18:30:04 tedu Exp $ */ +/* $OpenBSD: dead_vnops.c,v 1.29 2015/03/14 03:38:51 jsg Exp $ */ /* $NetBSD: dead_vnops.c,v 1.16 1996/02/13 13:12:48 mycroft Exp $ */ /* @@ -38,7 +38,6 @@ #include <sys/vnode.h> #include <sys/lock.h> #include <sys/errno.h> -#include <sys/namei.h> #include <sys/buf.h> #include <sys/poll.h> diff --git a/sys/miscfs/fuse/fusebuf.c b/sys/miscfs/fuse/fusebuf.c index e660ebb9551..73eb17a0094 100644 --- a/sys/miscfs/fuse/fusebuf.c +++ b/sys/miscfs/fuse/fusebuf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fusebuf.c,v 1.10 2014/12/03 23:00:49 deraadt Exp $ */ +/* $OpenBSD: fusebuf.c,v 1.11 2015/03/14 03:38:51 jsg Exp $ */ /* * Copyright (c) 2012-2013 Sylvestre Gallon <ccna.syl@gmail.com> * @@ -18,7 +18,6 @@ #include <sys/param.h> #include <sys/kernel.h> #include <sys/malloc.h> -#include <sys/mount.h> #include <sys/pool.h> #include <sys/statvfs.h> #include <sys/systm.h> diff --git a/sys/msdosfs/msdosfs_vnops.c b/sys/msdosfs/msdosfs_vnops.c index 6555398ffe3..3f1646010bf 100644 --- a/sys/msdosfs/msdosfs_vnops.c +++ b/sys/msdosfs/msdosfs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: msdosfs_vnops.c,v 1.98 2015/02/10 21:56:10 miod Exp $ */ +/* $OpenBSD: msdosfs_vnops.c,v 1.99 2015/03/14 03:38:51 jsg Exp $ */ /* $NetBSD: msdosfs_vnops.c,v 1.63 1997/10/17 11:24:19 ws Exp $ */ /*- @@ -53,7 +53,6 @@ #include <sys/systm.h> #include <sys/namei.h> #include <sys/resourcevar.h> /* defines plimit structure in proc struct */ -#include <sys/kernel.h> #include <sys/file.h> /* define FWRITE ... */ #include <sys/stat.h> #include <sys/buf.h> diff --git a/sys/net/bridgestp.c b/sys/net/bridgestp.c index f86bef91d39..f7cecc14fda 100644 --- a/sys/net/bridgestp.c +++ b/sys/net/bridgestp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bridgestp.c,v 1.51 2014/12/19 17:14:39 tedu Exp $ */ +/* $OpenBSD: bridgestp.c,v 1.52 2015/03/14 03:38:51 jsg Exp $ */ /* * Copyright (c) 2000 Jason L. Wright (jason@thought.net) @@ -49,7 +49,6 @@ #include <net/if_types.h> #include <net/if_dl.h> #include <net/if_llc.h> -#include <net/if_media.h> #include <net/netisr.h> #include <netinet/in.h> diff --git a/sys/net/if.c b/sys/net/if.c index a4ccf596609..ca33d741862 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if.c,v 1.320 2015/03/03 07:54:32 brad Exp $ */ +/* $OpenBSD: if.c,v 1.321 2015/03/14 03:38:51 jsg Exp $ */ /* $NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $ */ /* @@ -83,7 +83,6 @@ #include <net/if.h> #include <net/if_dl.h> -#include <net/if_media.h> #include <net/if_types.h> #include <net/route.h> #include <net/netisr.h> diff --git a/sys/net/if_enc.c b/sys/net/if_enc.c index aaf82b2b351..a49a6908041 100644 --- a/sys/net/if_enc.c +++ b/sys/net/if_enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_enc.c,v 1.59 2014/12/13 21:05:33 doug Exp $ */ +/* $OpenBSD: if_enc.c,v 1.60 2015/03/14 03:38:51 jsg Exp $ */ /* * Copyright (c) 2010 Reyk Floeter <reyk@vantronix.net> @@ -21,7 +21,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/malloc.h> #include <sys/socket.h> #include <sys/sockio.h> diff --git a/sys/net/if_gif.c b/sys/net/if_gif.c index 1dd8cfec79e..a60d2cdf731 100644 --- a/sys/net/if_gif.c +++ b/sys/net/if_gif.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_gif.c,v 1.72 2014/12/19 17:14:39 tedu Exp $ */ +/* $OpenBSD: if_gif.c,v 1.73 2015/03/14 03:38:51 jsg Exp $ */ /* $KAME: if_gif.c,v 1.43 2001/02/20 08:51:07 itojun Exp $ */ /* @@ -32,7 +32,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/mbuf.h> #include <sys/socket.h> #include <sys/sockio.h> diff --git a/sys/net/if_gre.c b/sys/net/if_gre.c index ec4a9211710..9372900b821 100644 --- a/sys/net/if_gre.c +++ b/sys/net/if_gre.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_gre.c,v 1.73 2014/12/19 17:14:39 tedu Exp $ */ +/* $OpenBSD: if_gre.c,v 1.74 2015/03/14 03:38:51 jsg Exp $ */ /* $NetBSD: if_gre.c,v 1.9 1999/10/25 19:18:11 drochner Exp $ */ /* @@ -54,7 +54,6 @@ #include <net/if.h> #include <net/if_types.h> -#include <net/netisr.h> #include <net/route.h> #include <netinet/in.h> diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c index de83df52460..4e7a96dc01e 100644 --- a/sys/net/if_loop.c +++ b/sys/net/if_loop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_loop.c,v 1.63 2015/01/27 10:20:31 mpi Exp $ */ +/* $OpenBSD: if_loop.c,v 1.64 2015/03/14 03:38:51 jsg Exp $ */ /* $NetBSD: if_loop.c,v 1.15 1996/05/07 02:40:33 thorpej Exp $ */ /* @@ -124,7 +124,6 @@ #include <net/route.h> #include <netinet/in.h> -#include <netinet/ip.h> #ifdef INET6 #include <netinet/ip6.h> diff --git a/sys/net/if_media.c b/sys/net/if_media.c index 3eee75764dd..6663ee58c6c 100644 --- a/sys/net/if_media.c +++ b/sys/net/if_media.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_media.c,v 1.25 2015/01/21 23:06:10 deraadt Exp $ */ +/* $OpenBSD: if_media.c,v 1.26 2015/03/14 03:38:51 jsg Exp $ */ /* $NetBSD: if_media.c,v 1.10 2000/03/13 23:52:39 soren Exp $ */ /*- @@ -84,7 +84,6 @@ #include <sys/malloc.h> #include <net/if.h> -#include <net/if_var.h> #include <net/if_media.h> #include <net/netisr.h> diff --git a/sys/net/if_pfsync.c b/sys/net/if_pfsync.c index 6f3a813fa42..77c63ce0d74 100644 --- a/sys/net/if_pfsync.c +++ b/sys/net/if_pfsync.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pfsync.c,v 1.217 2015/02/10 09:28:40 henning Exp $ */ +/* $OpenBSD: if_pfsync.c,v 1.218 2015/03/14 03:38:51 jsg Exp $ */ /* * Copyright (c) 2002 Michael Shalayeff @@ -77,7 +77,6 @@ #include <netinet6/in6_var.h> #include <netinet/ip6.h> #include <netinet6/ip6_var.h> -#include <netinet/icmp6.h> #include <netinet6/nd6.h> #endif /* INET6 */ diff --git a/sys/net/if_pppoe.c b/sys/net/if_pppoe.c index 88ed34d46dc..dc26afcd6c2 100644 --- a/sys/net/if_pppoe.c +++ b/sys/net/if_pppoe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pppoe.c,v 1.43 2014/12/05 15:50:04 mpi Exp $ */ +/* $OpenBSD: if_pppoe.c,v 1.44 2015/03/14 03:38:51 jsg Exp $ */ /* $NetBSD: if_pppoe.c,v 1.51 2003/11/28 08:56:48 keihan Exp $ */ /* @@ -48,7 +48,6 @@ #include <net/if_types.h> #include <net/if_sppp.h> #include <net/if_pppoe.h> -#include <net/netisr.h> #include <netinet/in.h> #include <netinet/if_ether.h> diff --git a/sys/net/if_trunk.c b/sys/net/if_trunk.c index d384c86b331..e3646488830 100644 --- a/sys/net/if_trunk.c +++ b/sys/net/if_trunk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_trunk.c,v 1.94 2014/12/19 17:14:39 tedu Exp $ */ +/* $OpenBSD: if_trunk.c,v 1.95 2015/03/14 03:38:51 jsg Exp $ */ /* * Copyright (c) 2005, 2006, 2007 Reyk Floeter <reyk@openbsd.org> @@ -32,7 +32,6 @@ #include <crypto/siphash.h> #include <net/if.h> -#include <net/if_arp.h> #include <net/if_dl.h> #include <net/if_media.h> #include <net/if_types.h> diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c index 7700b6edc49..1fba8ca2c1f 100644 --- a/sys/net/if_tun.c +++ b/sys/net/if_tun.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_tun.c,v 1.132 2015/02/10 21:56:10 miod Exp $ */ +/* $OpenBSD: if_tun.c,v 1.133 2015/03/14 03:38:51 jsg Exp $ */ /* $NetBSD: if_tun.c,v 1.24 1996/05/07 02:40:48 thorpej Exp $ */ /* @@ -62,7 +62,6 @@ #include <net/netisr.h> #include <netinet/in.h> -#include <netinet/ip.h> #include <netinet/if_ether.h> #ifdef PIPEX diff --git a/sys/net/if_vether.c b/sys/net/if_vether.c index cb9d35d48da..2dc92e015ec 100644 --- a/sys/net/if_vether.c +++ b/sys/net/if_vether.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vether.c,v 1.22 2014/12/19 17:14:40 tedu Exp $ */ +/* $OpenBSD: if_vether.c,v 1.23 2015/03/14 03:38:51 jsg Exp $ */ /* * Copyright (c) 2009 Theo de Raadt @@ -24,7 +24,6 @@ #include <sys/ioctl.h> #include <net/if.h> -#include <net/if_dl.h> #include <net/if_media.h> #include <netinet/in.h> diff --git a/sys/net/if_vxlan.c b/sys/net/if_vxlan.c index e9c6f8e8826..983f570a8ed 100644 --- a/sys/net/if_vxlan.c +++ b/sys/net/if_vxlan.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vxlan.c,v 1.21 2015/01/24 00:29:06 deraadt Exp $ */ +/* $OpenBSD: if_vxlan.c,v 1.22 2015/03/14 03:38:51 jsg Exp $ */ /* * Copyright (c) 2013 Reyk Floeter <reyk@openbsd.org> @@ -31,7 +31,6 @@ #include <net/if.h> #include <net/if_var.h> -#include <net/if_dl.h> #include <net/if_media.h> #include <net/route.h> diff --git a/sys/net/pf.c b/sys/net/pf.c index 800436b7a0a..0b073894ca4 100644 --- a/sys/net/pf.c +++ b/sys/net/pf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf.c,v 1.906 2015/02/14 23:32:41 sthen Exp $ */ +/* $OpenBSD: pf.c,v 1.907 2015/03/14 03:38:51 jsg Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -57,7 +57,6 @@ #include <net/if.h> #include <net/if_types.h> -#include <net/bpf.h> #include <net/route.h> #include <net/radix_mpath.h> diff --git a/sys/net/pf_if.c b/sys/net/pf_if.c index 451380ea03d..5a65a1990b0 100644 --- a/sys/net/pf_if.c +++ b/sys/net/pf_if.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_if.c,v 1.77 2014/12/19 17:14:40 tedu Exp $ */ +/* $OpenBSD: pf_if.c,v 1.78 2015/03/14 03:38:51 jsg Exp $ */ /* * Copyright 2005 Henning Brauer <henning@openbsd.org> @@ -46,7 +46,6 @@ #include <net/if.h> #include <net/if_var.h> -#include <net/if_types.h> #include <netinet/in.h> #include <netinet/ip.h> diff --git a/sys/net/pf_ioctl.c b/sys/net/pf_ioctl.c index cdb13b06f4b..fbed2e38b0c 100644 --- a/sys/net/pf_ioctl.c +++ b/sys/net/pf_ioctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_ioctl.c,v 1.283 2015/02/20 11:08:31 tedu Exp $ */ +/* $OpenBSD: pf_ioctl.c,v 1.284 2015/03/14 03:38:51 jsg Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -68,10 +68,6 @@ #include <crypto/md5.h> #include <net/pfvar.h> -#if NPFLOG > 0 -#include <net/if_pflog.h> -#endif /* NPFLOG > 0 */ - #if NPFSYNC > 0 #include <netinet/ip_ipsp.h> #include <net/if_pfsync.h> diff --git a/sys/net/pf_lb.c b/sys/net/pf_lb.c index 0d17256b6d5..c8ae0432783 100644 --- a/sys/net/pf_lb.c +++ b/sys/net/pf_lb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_lb.c,v 1.41 2015/01/06 01:49:45 jsg Exp $ */ +/* $OpenBSD: pf_lb.c,v 1.42 2015/03/14 03:38:51 jsg Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -54,7 +54,6 @@ #include <sys/stdint.h> #include <crypto/siphash.h> -#include <crypto/md5.h> #include <net/if.h> #include <net/if_types.h> diff --git a/sys/net/pf_norm.c b/sys/net/pf_norm.c index cd201bd5f66..6e661e6c53d 100644 --- a/sys/net/pf_norm.c +++ b/sys/net/pf_norm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_norm.c,v 1.174 2015/02/08 01:29:19 henning Exp $ */ +/* $OpenBSD: pf_norm.c,v 1.175 2015/03/14 03:38:51 jsg Exp $ */ /* * Copyright 2001 Niels Provos <provos@citi.umich.edu> @@ -52,7 +52,6 @@ #include <net/if.h> #include <net/if_var.h> #include <net/if_types.h> -#include <net/bpf.h> #include <net/if_pflog.h> #ifdef INET6 diff --git a/sys/net/pf_table.c b/sys/net/pf_table.c index 4e43c4ca539..10e6e4f1af4 100644 --- a/sys/net/pf_table.c +++ b/sys/net/pf_table.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_table.c,v 1.105 2015/01/20 17:25:35 mikeb Exp $ */ +/* $OpenBSD: pf_table.c,v 1.106 2015/03/14 03:38:51 jsg Exp $ */ /* * Copyright (c) 2002 Cedric Berger @@ -34,7 +34,6 @@ #include <sys/systm.h> #include <sys/socket.h> #include <sys/mbuf.h> -#include <sys/kernel.h> #include <sys/pool.h> #include <sys/syslog.h> diff --git a/sys/net/raw_cb.c b/sys/net/raw_cb.c index 70952aea2fa..8281642573c 100644 --- a/sys/net/raw_cb.c +++ b/sys/net/raw_cb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: raw_cb.c,v 1.8 2014/09/08 06:24:13 jsg Exp $ */ +/* $OpenBSD: raw_cb.c,v 1.9 2015/03/14 03:38:51 jsg Exp $ */ /* $NetBSD: raw_cb.c,v 1.9 1996/02/13 22:00:39 christos Exp $ */ /* @@ -41,7 +41,6 @@ #include <sys/protosw.h> #include <sys/errno.h> -#include <net/if.h> #include <net/raw_cb.h> #include <netinet/in.h> diff --git a/sys/net/raw_usrreq.c b/sys/net/raw_usrreq.c index c754dc4158e..048da3b7c3f 100644 --- a/sys/net/raw_usrreq.c +++ b/sys/net/raw_usrreq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: raw_usrreq.c,v 1.17 2014/09/08 06:24:13 jsg Exp $ */ +/* $OpenBSD: raw_usrreq.c,v 1.18 2015/03/14 03:38:51 jsg Exp $ */ /* $NetBSD: raw_usrreq.c,v 1.11 1996/02/13 22:00:43 christos Exp $ */ /* @@ -41,7 +41,6 @@ #include <sys/errno.h> #include <sys/systm.h> -#include <net/if.h> #include <net/netisr.h> #include <net/raw_cb.h> diff --git a/sys/net/trunklacp.c b/sys/net/trunklacp.c index 4094df0165b..7b2da3b470f 100644 --- a/sys/net/trunklacp.c +++ b/sys/net/trunklacp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trunklacp.c,v 1.18 2014/12/04 00:01:53 tedu Exp $ */ +/* $OpenBSD: trunklacp.c,v 1.19 2015/03/14 03:38:51 jsg Exp $ */ /* $NetBSD: ieee8023ad_lacp.c,v 1.3 2005/12/11 12:24:54 christos Exp $ */ /* $FreeBSD:ieee8023ad_lacp.c,v 1.15 2008/03/16 19:25:30 thompsa Exp $ */ @@ -44,7 +44,6 @@ #include <crypto/siphash.h> #include <net/if.h> -#include <net/if_dl.h> #include <net/ethertypes.h> #include <net/if_media.h> #include <net/if_types.h> diff --git a/sys/net80211/ieee80211.c b/sys/net80211/ieee80211.c index 0767bff1314..3484528e92f 100644 --- a/sys/net80211/ieee80211.c +++ b/sys/net80211/ieee80211.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee80211.c,v 1.43 2014/12/23 03:24:08 tedu Exp $ */ +/* $OpenBSD: ieee80211.c,v 1.44 2015/03/14 03:38:51 jsg Exp $ */ /* $NetBSD: ieee80211.c,v 1.19 2004/06/06 05:45:29 dyoung Exp $ */ /*- @@ -48,7 +48,6 @@ #include <net/if.h> #include <net/if_dl.h> #include <net/if_media.h> -#include <net/if_arp.h> #if NBPFILTER > 0 #include <net/bpf.h> diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c index fb1842dfdca..c4e29f3f666 100644 --- a/sys/net80211/ieee80211_input.c +++ b/sys/net80211/ieee80211_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee80211_input.c,v 1.132 2015/02/09 03:09:57 dlg Exp $ */ +/* $OpenBSD: ieee80211_input.c,v 1.133 2015/03/14 03:38:51 jsg Exp $ */ /*- * Copyright (c) 2001 Atsushi Onoe @@ -46,7 +46,6 @@ #include <net/if.h> #include <net/if_dl.h> #include <net/if_media.h> -#include <net/if_arp.h> #include <net/if_llc.h> #if NBPFILTER > 0 diff --git a/sys/net80211/ieee80211_ioctl.c b/sys/net80211/ieee80211_ioctl.c index 5e2e3e19978..8fb9802737d 100644 --- a/sys/net80211/ieee80211_ioctl.c +++ b/sys/net80211/ieee80211_ioctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee80211_ioctl.c,v 1.38 2014/12/23 03:24:08 tedu Exp $ */ +/* $OpenBSD: ieee80211_ioctl.c,v 1.39 2015/03/14 03:38:51 jsg Exp $ */ /* $NetBSD: ieee80211_ioctl.c,v 1.15 2004/05/06 02:58:16 dyoung Exp $ */ /*- @@ -42,7 +42,6 @@ #include <sys/tree.h> #include <net/if.h> -#include <net/if_arp.h> #include <net/if_media.h> #include <netinet/in.h> diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c index 1a1785ea4e9..4cd4ed172be 100644 --- a/sys/net80211/ieee80211_node.c +++ b/sys/net80211/ieee80211_node.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee80211_node.c,v 1.86 2014/12/23 03:24:08 tedu Exp $ */ +/* $OpenBSD: ieee80211_node.c,v 1.87 2015/03/14 03:38:51 jsg Exp $ */ /* $NetBSD: ieee80211_node.c,v 1.14 2004/05/09 09:18:47 dyoung Exp $ */ /*- @@ -30,7 +30,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "bpfilter.h" #include "bridge.h" #include <sys/param.h> @@ -50,10 +49,6 @@ #include <net/if_media.h> #include <net/if_arp.h> -#if NBPFILTER > 0 -#include <net/bpf.h> -#endif - #include <netinet/in.h> #include <netinet/if_ether.h> diff --git a/sys/net80211/ieee80211_output.c b/sys/net80211/ieee80211_output.c index fb414167363..cadb64ca354 100644 --- a/sys/net80211/ieee80211_output.c +++ b/sys/net80211/ieee80211_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee80211_output.c,v 1.93 2014/12/23 03:24:08 tedu Exp $ */ +/* $OpenBSD: ieee80211_output.c,v 1.94 2015/03/14 03:38:51 jsg Exp $ */ /* $NetBSD: ieee80211_output.c,v 1.13 2004/05/31 11:02:55 dyoung Exp $ */ /*- @@ -46,7 +46,6 @@ #include <net/if.h> #include <net/if_dl.h> #include <net/if_media.h> -#include <net/if_arp.h> #include <net/if_llc.h> #include <net/bpf.h> diff --git a/sys/net80211/ieee80211_pae_input.c b/sys/net80211/ieee80211_pae_input.c index a736b875b59..b204d83e77a 100644 --- a/sys/net80211/ieee80211_pae_input.c +++ b/sys/net80211/ieee80211_pae_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee80211_pae_input.c,v 1.23 2014/12/23 03:24:08 tedu Exp $ */ +/* $OpenBSD: ieee80211_pae_input.c,v 1.24 2015/03/14 03:38:51 jsg Exp $ */ /*- * Copyright (c) 2007,2008 Damien Bergamini <damien.bergamini@free.fr> @@ -33,7 +33,6 @@ #include <net/if.h> #include <net/if_dl.h> #include <net/if_media.h> -#include <net/if_arp.h> #include <netinet/in.h> #include <netinet/if_ether.h> diff --git a/sys/net80211/ieee80211_pae_output.c b/sys/net80211/ieee80211_pae_output.c index c34ce59d852..754fab9e6d6 100644 --- a/sys/net80211/ieee80211_pae_output.c +++ b/sys/net80211/ieee80211_pae_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee80211_pae_output.c,v 1.19 2014/12/23 03:24:08 tedu Exp $ */ +/* $OpenBSD: ieee80211_pae_output.c,v 1.20 2015/03/14 03:38:51 jsg Exp $ */ /*- * Copyright (c) 2007,2008 Damien Bergamini <damien.bergamini@free.fr> @@ -36,7 +36,6 @@ #include <net/if_media.h> #include <net/if_arp.h> #include <net/if_llc.h> -#include <net/bpf.h> #include <netinet/in.h> #include <netinet/if_ether.h> diff --git a/sys/net80211/ieee80211_proto.c b/sys/net80211/ieee80211_proto.c index 9412fdc5fb2..a31c225afb1 100644 --- a/sys/net80211/ieee80211_proto.c +++ b/sys/net80211/ieee80211_proto.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee80211_proto.c,v 1.50 2014/12/23 03:24:08 tedu Exp $ */ +/* $OpenBSD: ieee80211_proto.c,v 1.51 2015/03/14 03:38:51 jsg Exp $ */ /* $NetBSD: ieee80211_proto.c,v 1.8 2004/04/30 23:58:20 dyoung Exp $ */ /*- @@ -34,8 +34,6 @@ * IEEE 802.11 protocol support. */ -#include "bpfilter.h" - #include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> @@ -52,10 +50,6 @@ #include <net/if_arp.h> #include <net/if_llc.h> -#if NBPFILTER > 0 -#include <net/bpf.h> -#endif - #include <netinet/in.h> #include <netinet/if_ether.h> diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c index 457ed47df02..68ddf9f981b 100644 --- a/sys/netinet/if_ether.c +++ b/sys/netinet/if_ether.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ether.c,v 1.146 2015/02/11 23:34:43 mpi Exp $ */ +/* $OpenBSD: if_ether.c,v 1.147 2015/03/14 03:38:51 jsg Exp $ */ /* $NetBSD: if_ether.c,v 1.31 1996/05/11 12:59:58 mycroft Exp $ */ /* @@ -1058,7 +1058,6 @@ revarpwhoami(struct in_addr *in, struct ifnet *ifp) #ifdef DDB #include <machine/db_machdep.h> -#include <ddb/db_interface.h> #include <ddb/db_output.h> void diff --git a/sys/netinet/in_cksum.c b/sys/netinet/in_cksum.c index 1e99f13ac58..10241f63bc3 100644 --- a/sys/netinet/in_cksum.c +++ b/sys/netinet/in_cksum.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in_cksum.c,v 1.6 2003/12/10 07:22:43 itojun Exp $ */ +/* $OpenBSD: in_cksum.c,v 1.7 2015/03/14 03:38:51 jsg Exp $ */ /* $NetBSD: in_cksum.c,v 1.11 1996/04/08 19:55:37 jonathan Exp $ */ /* @@ -35,7 +35,6 @@ #include <sys/param.h> #include <sys/mbuf.h> #include <sys/systm.h> -#include <netinet/in.h> /* * Checksum routine for Internet Protocol family headers (Portable Version). diff --git a/sys/netinet/in_gif.c b/sys/netinet/in_gif.c index 7bdb5a8cb0a..61995b73206 100644 --- a/sys/netinet/in_gif.c +++ b/sys/netinet/in_gif.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in_gif.c,v 1.42 2014/12/05 15:50:04 mpi Exp $ */ +/* $OpenBSD: in_gif.c,v 1.43 2015/03/14 03:38:51 jsg Exp $ */ /* $KAME: in_gif.c,v 1.50 2001/01/22 07:27:16 itojun Exp $ */ /* @@ -48,10 +48,6 @@ #include <netinet/in_gif.h> #include <netinet/ip_ipsp.h> -#ifdef INET6 -#include <netinet/ip6.h> -#endif - #include "gif.h" #include "bridge.h" #if NBRIDGE > 0 diff --git a/sys/netinet/inet_nat64.c b/sys/netinet/inet_nat64.c index c184525977d..79d3c4539d3 100644 --- a/sys/netinet/inet_nat64.c +++ b/sys/netinet/inet_nat64.c @@ -1,4 +1,4 @@ -/* $OpenBSD: inet_nat64.c,v 1.1 2011/10/13 18:23:40 claudio Exp $ */ +/* $OpenBSD: inet_nat64.c,v 1.2 2015/03/14 03:38:51 jsg Exp $ */ /* $vantronix: inet_nat64.c,v 1.2 2011/02/28 14:57:58 mike Exp $ */ /* @@ -21,9 +21,7 @@ #include <sys/socket.h> #ifdef _KERNEL #include <sys/mbuf.h> -#include <netinet/in.h> #else -#include <netinet/in.h> #include <errno.h> #endif diff --git a/sys/netinet/inet_ntop.c b/sys/netinet/inet_ntop.c index 809a7cfdc39..6a1d3f99057 100644 --- a/sys/netinet/inet_ntop.c +++ b/sys/netinet/inet_ntop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: inet_ntop.c,v 1.2 2014/05/20 09:16:43 mpi Exp $ */ +/* $OpenBSD: inet_ntop.c,v 1.3 2015/03/14 03:38:51 jsg Exp $ */ /* Copyright (c) 1996 by Internet Software Consortium. * @@ -20,7 +20,6 @@ #include <sys/systm.h> #include <sys/socket.h> -#include <net/if.h> #include <netinet/in.h> #define IN6ADDRSZ 16 diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c index 00de1dc39a2..274aa2ebbe3 100644 --- a/sys/netinet/ip_carp.c +++ b/sys/netinet/ip_carp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_carp.c,v 1.247 2015/03/04 10:59:52 mpi Exp $ */ +/* $OpenBSD: ip_carp.c,v 1.248 2015/03/14 03:38:51 jsg Exp $ */ /* * Copyright (c) 2002 Michael Shalayeff. All rights reserved. @@ -63,7 +63,6 @@ #include <netinet/if_ether.h> #include <netinet/ip_ipsp.h> -#include <net/if_enc.h> #include <net/if_dl.h> #ifdef INET6 diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index 72c9029ea24..d0525fb3e66 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_input.c,v 1.246 2015/02/09 12:18:19 claudio Exp $ */ +/* $OpenBSD: ip_input.c,v 1.247 2015/03/14 03:38:52 jsg Exp $ */ /* $NetBSD: ip_input.c,v 1.30 1996/03/16 23:53:58 christos Exp $ */ /* @@ -42,7 +42,6 @@ #include <sys/protosw.h> #include <sys/socket.h> #include <sys/socketvar.h> -#include <sys/syslog.h> #include <sys/sysctl.h> #include <sys/pool.h> diff --git a/sys/netinet/ip_ipcomp.c b/sys/netinet/ip_ipcomp.c index 2aa111d506b..e9680c12ebb 100644 --- a/sys/netinet/ip_ipcomp.c +++ b/sys/netinet/ip_ipcomp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_ipcomp.c,v 1.39 2014/12/19 17:14:40 tedu Exp $ */ +/* $OpenBSD: ip_ipcomp.c,v 1.40 2015/03/14 03:38:52 jsg Exp $ */ /* * Copyright (c) 2001 Jean-Jacques Bernard-Gundol (jj@wabbitt.org) @@ -54,8 +54,6 @@ #include <crypto/cryptodev.h> #include <crypto/xform.h> -#include <lib/libz/zlib.h> - #include "bpfilter.h" int ipcomp_output_cb(void *); diff --git a/sys/netinet/ip_ipsp.c b/sys/netinet/ip_ipsp.c index 377a3117e53..d9e62a6e7dd 100644 --- a/sys/netinet/ip_ipsp.c +++ b/sys/netinet/ip_ipsp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_ipsp.c,v 1.203 2015/01/24 00:29:06 deraadt Exp $ */ +/* $OpenBSD: ip_ipsp.c,v 1.204 2015/03/14 03:38:52 jsg Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), * Angelos D. Keromytis (kermit@csd.uch.gr), @@ -65,7 +65,6 @@ #include <netinet/ip_ipsp.h> #include <net/pfkeyv2.h> -#include <crypto/xform.h> #ifdef DDB #include <ddb/db_output.h> diff --git a/sys/netinet/ip_spd.c b/sys/netinet/ip_spd.c index e0891fc46bb..68a08c5e311 100644 --- a/sys/netinet/ip_spd.c +++ b/sys/netinet/ip_spd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_spd.c,v 1.77 2014/12/19 17:14:40 tedu Exp $ */ +/* $OpenBSD: ip_spd.c,v 1.78 2015/03/14 03:38:52 jsg Exp $ */ /* * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu) * @@ -30,7 +30,6 @@ #include <sys/pool.h> #include <sys/timeout.h> -#include <net/if.h> #include <net/route.h> #include <net/netisr.h> diff --git a/sys/netinet/tcp_debug.c b/sys/netinet/tcp_debug.c index 1239a22c6a3..46502037d8a 100644 --- a/sys/netinet/tcp_debug.c +++ b/sys/netinet/tcp_debug.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_debug.c,v 1.22 2014/11/20 14:51:42 krw Exp $ */ +/* $OpenBSD: tcp_debug.c,v 1.23 2015/03/14 03:38:52 jsg Exp $ */ /* $NetBSD: tcp_debug.c,v 1.10 1996/02/13 23:43:36 christos Exp $ */ /* @@ -83,7 +83,6 @@ #include <sys/protosw.h> #include <net/route.h> -#include <net/if.h> #include <netinet/in.h> #include <netinet/in_systm.h> diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c index 15ce4901a6b..b245e0a9509 100644 --- a/sys/netinet/tcp_output.c +++ b/sys/netinet/tcp_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_output.c,v 1.108 2014/12/19 17:14:40 tedu Exp $ */ +/* $OpenBSD: tcp_output.c,v 1.109 2015/03/14 03:38:52 jsg Exp $ */ /* $NetBSD: tcp_output.c,v 1.16 1997/06/03 16:17:09 kml Exp $ */ /* @@ -79,7 +79,6 @@ #include <sys/kernel.h> #include <net/route.h> -#include <net/if.h> #include <netinet/in.h> #include <netinet/ip.h> diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index d543472b119..c8c8e77275f 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_subr.c,v 1.139 2014/12/19 17:14:40 tedu Exp $ */ +/* $OpenBSD: tcp_subr.c,v 1.140 2015/03/14 03:38:52 jsg Exp $ */ /* $NetBSD: tcp_subr.c,v 1.22 1996/02/13 23:44:00 christos Exp $ */ /* @@ -79,7 +79,6 @@ #include <sys/pool.h> #include <net/route.h> -#include <net/if.h> #include <netinet/in.h> #include <netinet/ip.h> diff --git a/sys/netinet6/dest6.c b/sys/netinet6/dest6.c index 2a6e5f09ba7..f00e12e4352 100644 --- a/sys/netinet6/dest6.c +++ b/sys/netinet6/dest6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dest6.c,v 1.14 2014/09/08 06:24:13 jsg Exp $ */ +/* $OpenBSD: dest6.c,v 1.15 2015/03/14 03:38:52 jsg Exp $ */ /* $KAME: dest6.c,v 1.25 2001/02/22 01:39:16 itojun Exp $ */ /* @@ -40,8 +40,6 @@ #include <sys/time.h> #include <sys/kernel.h> -#include <net/if.h> - #include <netinet/in.h> #include <netinet/ip6.h> #include <netinet6/ip6_var.h> diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c index f61d25ef33f..5d90cee0774 100644 --- a/sys/netinet6/in6.c +++ b/sys/netinet6/in6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in6.c,v 1.153 2015/02/19 22:23:05 bluhm Exp $ */ +/* $OpenBSD: in6.c,v 1.154 2015/03/14 03:38:52 jsg Exp $ */ /* $KAME: in6.c,v 1.372 2004/06/14 08:14:21 itojun Exp $ */ /* @@ -80,7 +80,6 @@ #include <net/if.h> #include <net/if_types.h> #include <net/route.h> -#include <net/if_dl.h> #include <netinet/in.h> #include <netinet/if_ether.h> diff --git a/sys/netinet6/in6_gif.c b/sys/netinet6/in6_gif.c index 13c8a064914..cbbe81b83e0 100644 --- a/sys/netinet6/in6_gif.c +++ b/sys/netinet6/in6_gif.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in6_gif.c,v 1.36 2015/01/24 00:29:06 deraadt Exp $ */ +/* $OpenBSD: in6_gif.c,v 1.37 2015/03/14 03:38:52 jsg Exp $ */ /* $KAME: in6_gif.c,v 1.43 2001/01/22 07:27:17 itojun Exp $ */ /* @@ -51,8 +51,6 @@ #include <net/pfvar.h> #endif -#include <netinet/ip.h> - #include <netinet/ip6.h> #include <netinet6/ip6_var.h> #include <netinet6/in6_gif.h> diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c index b0c88f36d21..983b4c03eea 100644 --- a/sys/netinet6/in6_ifattach.c +++ b/sys/netinet6/in6_ifattach.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in6_ifattach.c,v 1.85 2015/02/05 03:01:03 mpi Exp $ */ +/* $OpenBSD: in6_ifattach.c,v 1.86 2015/03/14 03:38:52 jsg Exp $ */ /* $KAME: in6_ifattach.c,v 1.124 2001/07/18 08:32:51 jinmei Exp $ */ /* @@ -46,7 +46,6 @@ #include <net/route.h> #include <netinet/in.h> -#include <netinet/if_ether.h> #include <netinet6/in6_var.h> #include <netinet/ip6.h> diff --git a/sys/netinet6/ip6_forward.c b/sys/netinet6/ip6_forward.c index fd35316a8a9..dbea200e608 100644 --- a/sys/netinet6/ip6_forward.c +++ b/sys/netinet6/ip6_forward.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6_forward.c,v 1.71 2014/12/05 15:50:04 mpi Exp $ */ +/* $OpenBSD: ip6_forward.c,v 1.72 2015/03/14 03:38:52 jsg Exp $ */ /* $KAME: ip6_forward.c,v 1.75 2001/06/29 12:42:13 jinmei Exp $ */ /* @@ -66,7 +66,6 @@ #include <netinet/ip_esp.h> #include <netinet/udp.h> #include <netinet/tcp.h> -#include <net/pfkeyv2.h> #endif struct route_in6 ip6_forward_rt; diff --git a/sys/netinet6/ip6_id.c b/sys/netinet6/ip6_id.c index 8c8f569215c..084b28b060f 100644 --- a/sys/netinet6/ip6_id.c +++ b/sys/netinet6/ip6_id.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6_id.c,v 1.9 2014/11/18 02:37:31 tedu Exp $ */ +/* $OpenBSD: ip6_id.c,v 1.10 2015/03/14 03:38:52 jsg Exp $ */ /* $NetBSD: ip6_id.c,v 1.7 2003/09/13 21:32:59 itojun Exp $ */ /* $KAME: ip6_id.c,v 1.8 2003/09/06 13:41:06 itojun Exp $ */ @@ -87,7 +87,6 @@ #include <sys/socket.h> #include <sys/systm.h> -#include <net/if.h> #include <netinet/in.h> #include <netinet/ip6.h> #include <netinet6/ip6_var.h> diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c index 08e86fb8c1a..f4c9351a704 100644 --- a/sys/netinet6/ip6_input.c +++ b/sys/netinet6/ip6_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6_input.c,v 1.139 2015/02/09 12:23:22 claudio Exp $ */ +/* $OpenBSD: ip6_input.c,v 1.140 2015/03/14 03:38:52 jsg Exp $ */ /* $KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $ */ /* @@ -81,7 +81,6 @@ #include <net/if.h> #include <net/if_var.h> #include <net/if_types.h> -#include <net/if_dl.h> #include <net/route.h> #include <net/netisr.h> diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c index b360e0125ed..09a773a211a 100644 --- a/sys/netinet6/ip6_mroute.c +++ b/sys/netinet6/ip6_mroute.c @@ -108,7 +108,6 @@ #include <netinet/ip6.h> #include <netinet6/ip6_var.h> #include <netinet6/ip6_mroute.h> -#include <netinet6/pim6.h> #include <netinet6/pim6_var.h> #include <netinet6/nd6.h> diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c index b1838784307..a52a322696f 100644 --- a/sys/netinet6/ip6_output.c +++ b/sys/netinet6/ip6_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6_output.c,v 1.167 2015/02/12 12:12:45 mpi Exp $ */ +/* $OpenBSD: ip6_output.c,v 1.168 2015/03/14 03:38:52 jsg Exp $ */ /* $KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $ */ /* @@ -106,7 +106,6 @@ #include <netinet/ip_ipsp.h> #include <netinet/ip_ah.h> #include <netinet/ip_esp.h> -#include <net/pfkeyv2.h> #endif /* IPSEC */ struct ip6_exthdrs { diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c index a7420585170..43cad6b5bce 100644 --- a/sys/netinet6/nd6_nbr.c +++ b/sys/netinet6/nd6_nbr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nd6_nbr.c,v 1.88 2014/12/17 09:57:13 mpi Exp $ */ +/* $OpenBSD: nd6_nbr.c,v 1.89 2015/03/14 03:38:52 jsg Exp $ */ /* $KAME: nd6_nbr.c,v 1.61 2001/02/10 16:06:14 jinmei Exp $ */ /* @@ -38,7 +38,6 @@ #include <sys/sockio.h> #include <sys/time.h> #include <sys/kernel.h> -#include <sys/errno.h> #include <sys/ioctl.h> #include <sys/syslog.h> #include <sys/queue.h> diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c index 60e289f8c8f..50f577d0c63 100644 --- a/sys/netinet6/nd6_rtr.c +++ b/sys/netinet6/nd6_rtr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nd6_rtr.c,v 1.99 2015/03/09 18:09:50 mikeb Exp $ */ +/* $OpenBSD: nd6_rtr.c,v 1.100 2015/03/14 03:38:52 jsg Exp $ */ /* $KAME: nd6_rtr.c,v 1.97 2001/02/07 11:09:13 itojun Exp $ */ /* @@ -47,7 +47,6 @@ #include <net/if.h> #include <net/if_var.h> #include <net/if_types.h> -#include <net/if_dl.h> #include <net/route.h> #include <net/radix.h> diff --git a/sys/nfs/krpc_subr.c b/sys/nfs/krpc_subr.c index 7227754e969..e40c006217c 100644 --- a/sys/nfs/krpc_subr.c +++ b/sys/nfs/krpc_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: krpc_subr.c,v 1.25 2014/12/18 20:59:21 tedu Exp $ */ +/* $OpenBSD: krpc_subr.c,v 1.26 2015/03/14 03:38:52 jsg Exp $ */ /* $NetBSD: krpc_subr.c,v 1.12.4.1 1996/06/07 00:52:26 cgd Exp $ */ /* @@ -54,7 +54,6 @@ #include <sys/socket.h> #include <sys/socketvar.h> -#include <net/if.h> #include <netinet/in.h> #include <nfs/rpcv2.h> diff --git a/sys/nfs/nfs_bio.c b/sys/nfs/nfs_bio.c index 458e0d17c30..87b67977c89 100644 --- a/sys/nfs/nfs_bio.c +++ b/sys/nfs/nfs_bio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_bio.c,v 1.79 2015/02/10 21:56:10 miod Exp $ */ +/* $OpenBSD: nfs_bio.c,v 1.80 2015/03/14 03:38:52 jsg Exp $ */ /* $NetBSD: nfs_bio.c,v 1.25.4.2 1996/07/08 20:47:04 jtc Exp $ */ /* @@ -48,7 +48,6 @@ #include <sys/queue.h> #include <sys/time.h> -#include <nfs/rpcv2.h> #include <nfs/nfsproto.h> #include <nfs/nfs.h> #include <nfs/nfsmount.h> diff --git a/sys/nfs/nfs_node.c b/sys/nfs/nfs_node.c index 4d9bbd1d971..f3b59a9241e 100644 --- a/sys/nfs/nfs_node.c +++ b/sys/nfs/nfs_node.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_node.c,v 1.61 2014/12/23 07:54:13 tedu Exp $ */ +/* $OpenBSD: nfs_node.c,v 1.62 2015/03/14 03:38:52 jsg Exp $ */ /* $NetBSD: nfs_node.c,v 1.16 1996/02/18 11:53:42 fvdl Exp $ */ /* @@ -51,7 +51,6 @@ #include <nfs/rpcv2.h> #include <nfs/nfsproto.h> -#include <nfs/nfs.h> #include <nfs/nfsnode.h> #include <nfs/nfsmount.h> #include <nfs/nfs_var.h> diff --git a/sys/nfs/nfs_serv.c b/sys/nfs/nfs_serv.c index 71c33f98795..74d6613c268 100644 --- a/sys/nfs/nfs_serv.c +++ b/sys/nfs/nfs_serv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_serv.c,v 1.101 2014/12/16 18:30:04 tedu Exp $ */ +/* $OpenBSD: nfs_serv.c,v 1.102 2015/03/14 03:38:52 jsg Exp $ */ /* $NetBSD: nfs_serv.c,v 1.34 1997/05/12 23:37:12 fvdl Exp $ */ /* @@ -76,7 +76,6 @@ #include <ufs/ufs/dir.h> #include <nfs/nfsproto.h> -#include <nfs/rpcv2.h> #include <nfs/nfs.h> #include <nfs/xdr_subs.h> #include <nfs/nfsm_subs.h> diff --git a/sys/nfs/nfs_socket.c b/sys/nfs/nfs_socket.c index b412cb47eb9..9edd6154a49 100644 --- a/sys/nfs/nfs_socket.c +++ b/sys/nfs/nfs_socket.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_socket.c,v 1.107 2015/01/17 17:49:27 deraadt Exp $ */ +/* $OpenBSD: nfs_socket.c,v 1.108 2015/03/14 03:38:52 jsg Exp $ */ /* $NetBSD: nfs_socket.c,v 1.27 1996/04/15 20:20:00 thorpej Exp $ */ /* @@ -66,7 +66,6 @@ #include <nfs/xdr_subs.h> #include <nfs/nfsm_subs.h> #include <nfs/nfsmount.h> -#include <nfs/nfsnode.h> #include <nfs/nfs_var.h> /* External data, mostly RPC constants in XDR form. */ diff --git a/sys/nfs/nfs_srvcache.c b/sys/nfs/nfs_srvcache.c index d3ddb77316d..6e4c2d21ef0 100644 --- a/sys/nfs/nfs_srvcache.c +++ b/sys/nfs/nfs_srvcache.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_srvcache.c,v 1.26 2014/11/18 10:42:15 dlg Exp $ */ +/* $OpenBSD: nfs_srvcache.c,v 1.27 2015/03/14 03:38:52 jsg Exp $ */ /* $NetBSD: nfs_srvcache.c,v 1.12 1996/02/18 11:53:49 fvdl Exp $ */ /* @@ -52,7 +52,6 @@ #include <crypto/siphash.h> #include <netinet/in.h> -#include <nfs/rpcv2.h> #include <nfs/nfsproto.h> #include <nfs/nfs.h> #include <nfs/nfsrvcache.h> diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c index 447c7e8f5ae..ac27c29b8c0 100644 --- a/sys/nfs/nfs_subs.c +++ b/sys/nfs/nfs_subs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_subs.c,v 1.125 2015/02/10 21:56:10 miod Exp $ */ +/* $OpenBSD: nfs_subs.c,v 1.126 2015/03/14 03:38:52 jsg Exp $ */ /* $NetBSD: nfs_subs.c,v 1.27.4.3 1996/07/08 20:34:24 jtc Exp $ */ /* @@ -53,7 +53,6 @@ #include <sys/stat.h> #include <sys/pool.h> #include <sys/time.h> -#include <sys/specdev.h> #include <nfs/rpcv2.h> #include <nfs/nfsproto.h> diff --git a/sys/nfs/nfs_syscalls.c b/sys/nfs/nfs_syscalls.c index da84ada82ae..2f05d36d9d6 100644 --- a/sys/nfs/nfs_syscalls.c +++ b/sys/nfs/nfs_syscalls.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_syscalls.c,v 1.98 2014/11/15 00:03:12 tedu Exp $ */ +/* $OpenBSD: nfs_syscalls.c,v 1.99 2015/03/14 03:38:52 jsg Exp $ */ /* $NetBSD: nfs_syscalls.c,v 1.19 1996/02/18 11:53:52 fvdl Exp $ */ /* @@ -67,7 +67,6 @@ #include <nfs/rpcv2.h> #include <nfs/nfsproto.h> #include <nfs/nfs.h> -#include <nfs/nfsm_subs.h> #include <nfs/nfsrvcache.h> #include <nfs/nfsmount.h> #include <nfs/nfsnode.h> diff --git a/sys/nfs/nfs_vfsops.c b/sys/nfs/nfs_vfsops.c index de00884ec92..cb9382da19f 100644 --- a/sys/nfs/nfs_vfsops.c +++ b/sys/nfs/nfs_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_vfsops.c,v 1.106 2015/01/17 17:49:27 deraadt Exp $ */ +/* $OpenBSD: nfs_vfsops.c,v 1.107 2015/03/14 03:38:52 jsg Exp $ */ /* $NetBSD: nfs_vfsops.c,v 1.46.4.1 1996/05/25 22:40:35 fvdl Exp $ */ /* @@ -55,7 +55,6 @@ #include <sys/sysctl.h> #include <sys/queue.h> -#include <net/if.h> #include <netinet/in.h> #include <nfs/rpcv2.h> diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c index a16dca17d85..8569053dd79 100644 --- a/sys/nfs/nfs_vnops.c +++ b/sys/nfs/nfs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_vnops.c,v 1.161 2015/02/10 21:56:10 miod Exp $ */ +/* $OpenBSD: nfs_vnops.c,v 1.162 2015/03/14 03:38:52 jsg Exp $ */ /* $NetBSD: nfs_vnops.c,v 1.62.4.1 1996/07/08 20:26:52 jtc Exp $ */ /* @@ -75,7 +75,6 @@ #include <uvm/uvm_extern.h> -#include <net/if.h> #include <netinet/in.h> void nfs_cache_enter(struct vnode *, struct vnode *, struct componentname *); diff --git a/sys/ntfs/ntfs_ihash.c b/sys/ntfs/ntfs_ihash.c index ff68df8eefd..e8ed6ac2bc0 100644 --- a/sys/ntfs/ntfs_ihash.c +++ b/sys/ntfs/ntfs_ihash.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ntfs_ihash.c,v 1.18 2015/01/09 05:01:57 tedu Exp $ */ +/* $OpenBSD: ntfs_ihash.c,v 1.19 2015/03/14 03:38:52 jsg Exp $ */ /* $NetBSD: ntfs_ihash.c,v 1.1 2002/12/23 17:38:32 jdolecek Exp $ */ /* @@ -35,7 +35,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/rwlock.h> #include <sys/vnode.h> #include <sys/malloc.h> diff --git a/sys/ntfs/ntfs_subr.c b/sys/ntfs/ntfs_subr.c index e058dfc5e2d..1ed82730962 100644 --- a/sys/ntfs/ntfs_subr.c +++ b/sys/ntfs/ntfs_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ntfs_subr.c,v 1.43 2015/02/10 22:04:00 miod Exp $ */ +/* $OpenBSD: ntfs_subr.c,v 1.44 2015/03/14 03:38:52 jsg Exp $ */ /* $NetBSD: ntfs_subr.c,v 1.4 2003/04/10 21:37:32 jdolecek Exp $ */ /*- @@ -37,7 +37,6 @@ #include <sys/lock.h> #include <sys/mount.h> #include <sys/buf.h> -#include <sys/file.h> #include <sys/malloc.h> #include <sys/rwlock.h> #include <sys/specdev.h> diff --git a/sys/ntfs/ntfs_vfsops.c b/sys/ntfs/ntfs_vfsops.c index cd642072140..d7ef07b85dd 100644 --- a/sys/ntfs/ntfs_vfsops.c +++ b/sys/ntfs/ntfs_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ntfs_vfsops.c,v 1.43 2014/12/16 19:56:33 tedu Exp $ */ +/* $OpenBSD: ntfs_vfsops.c,v 1.44 2015/03/14 03:38:52 jsg Exp $ */ /* $NetBSD: ntfs_vfsops.c,v 1.7 2003/04/24 07:50:19 christos Exp $ */ /*- @@ -51,7 +51,6 @@ #include <ntfs/ntfs_subr.h> #include <ntfs/ntfs_vfsops.h> #include <ntfs/ntfs_ihash.h> -#include <ntfs/ntfsmount.h> int ntfs_mount(struct mount *, const char *, void *, struct nameidata *, struct proc *); diff --git a/sys/ntfs/ntfs_vnops.c b/sys/ntfs/ntfs_vnops.c index 7301cfe2170..8916dfa2b30 100644 --- a/sys/ntfs/ntfs_vnops.c +++ b/sys/ntfs/ntfs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ntfs_vnops.c,v 1.39 2015/02/10 21:58:16 miod Exp $ */ +/* $OpenBSD: ntfs_vnops.c,v 1.40 2015/03/14 03:38:52 jsg Exp $ */ /* $NetBSD: ntfs_vnops.c,v 1.6 2003/04/10 21:57:26 jdolecek Exp $ */ /* @@ -38,7 +38,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/time.h> #include <sys/stat.h> #include <sys/vnode.h> diff --git a/sys/scsi/ch.c b/sys/scsi/ch.c index 90dc03d2fc6..177b3030885 100644 --- a/sys/scsi/ch.c +++ b/sys/scsi/ch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ch.c,v 1.49 2014/09/14 14:17:26 jsg Exp $ */ +/* $OpenBSD: ch.c,v 1.50 2015/03/14 03:38:52 jsg Exp $ */ /* $NetBSD: ch.c,v 1.26 1997/02/21 22:06:52 thorpej Exp $ */ /* @@ -41,7 +41,6 @@ #include <sys/systm.h> #include <sys/errno.h> #include <sys/ioctl.h> -#include <sys/buf.h> #include <sys/chio.h> #include <sys/device.h> #include <sys/malloc.h> diff --git a/sys/scsi/mpath.c b/sys/scsi/mpath.c index ca2e9a9f1bf..7ec254b1f52 100644 --- a/sys/scsi/mpath.c +++ b/sys/scsi/mpath.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpath.c,v 1.38 2015/03/04 23:52:43 dlg Exp $ */ +/* $OpenBSD: mpath.c,v 1.39 2015/03/14 03:38:52 jsg Exp $ */ /* * Copyright (c) 2009 David Gwynne <dlg@openbsd.org> @@ -18,7 +18,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/buf.h> #include <sys/kernel.h> #include <sys/malloc.h> #include <sys/device.h> diff --git a/sys/scsi/mpath_emc.c b/sys/scsi/mpath_emc.c index dd91035ad58..4a0ec263d2f 100644 --- a/sys/scsi/mpath_emc.c +++ b/sys/scsi/mpath_emc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpath_emc.c,v 1.20 2014/09/14 14:17:26 jsg Exp $ */ +/* $OpenBSD: mpath_emc.c,v 1.21 2015/03/14 03:38:52 jsg Exp $ */ /* * Copyright (c) 2011 David Gwynne <dlg@openbsd.org> @@ -20,7 +20,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/buf.h> #include <sys/kernel.h> #include <sys/malloc.h> #include <sys/device.h> diff --git a/sys/scsi/mpath_hds.c b/sys/scsi/mpath_hds.c index 49bcd39e94e..9c2159ad2bf 100644 --- a/sys/scsi/mpath_hds.c +++ b/sys/scsi/mpath_hds.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpath_hds.c,v 1.17 2014/09/14 14:17:26 jsg Exp $ */ +/* $OpenBSD: mpath_hds.c,v 1.18 2015/03/14 03:38:52 jsg Exp $ */ /* * Copyright (c) 2011 David Gwynne <dlg@openbsd.org> @@ -20,7 +20,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/buf.h> #include <sys/kernel.h> #include <sys/malloc.h> #include <sys/device.h> diff --git a/sys/scsi/mpath_rdac.c b/sys/scsi/mpath_rdac.c index 3917d60228b..bcae6e489d1 100644 --- a/sys/scsi/mpath_rdac.c +++ b/sys/scsi/mpath_rdac.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpath_rdac.c,v 1.22 2014/09/14 14:17:26 jsg Exp $ */ +/* $OpenBSD: mpath_rdac.c,v 1.23 2015/03/14 03:38:52 jsg Exp $ */ /* * Copyright (c) 2010 David Gwynne <dlg@openbsd.org> @@ -20,7 +20,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/buf.h> #include <sys/kernel.h> #include <sys/malloc.h> #include <sys/device.h> diff --git a/sys/scsi/mpath_sym.c b/sys/scsi/mpath_sym.c index ecdabbcefcb..b251a62d529 100644 --- a/sys/scsi/mpath_sym.c +++ b/sys/scsi/mpath_sym.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpath_sym.c,v 1.22 2014/09/14 14:17:26 jsg Exp $ */ +/* $OpenBSD: mpath_sym.c,v 1.23 2015/03/14 03:38:52 jsg Exp $ */ /* * Copyright (c) 2010 David Gwynne <dlg@openbsd.org> @@ -18,7 +18,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/buf.h> #include <sys/kernel.h> #include <sys/malloc.h> #include <sys/device.h> diff --git a/sys/scsi/scsi_base.c b/sys/scsi/scsi_base.c index ed976159163..6c07fa758da 100644 --- a/sys/scsi/scsi_base.c +++ b/sys/scsi/scsi_base.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scsi_base.c,v 1.219 2015/03/08 20:49:38 krw Exp $ */ +/* $OpenBSD: scsi_base.c,v 1.220 2015/03/14 03:38:52 jsg Exp $ */ /* $NetBSD: scsi_base.c,v 1.43 1997/04/02 02:29:36 mycroft Exp $ */ /* @@ -39,7 +39,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> -#include <sys/buf.h> #include <sys/uio.h> #include <sys/errno.h> #include <sys/device.h> diff --git a/sys/scsi/scsi_ioctl.c b/sys/scsi/scsi_ioctl.c index 44fbba69502..7c6fb2719b1 100644 --- a/sys/scsi/scsi_ioctl.c +++ b/sys/scsi/scsi_ioctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scsi_ioctl.c,v 1.49 2014/12/15 02:11:57 tedu Exp $ */ +/* $OpenBSD: scsi_ioctl.c,v 1.50 2015/03/14 03:38:52 jsg Exp $ */ /* $NetBSD: scsi_ioctl.c,v 1.23 1996/10/12 23:23:17 christos Exp $ */ /* @@ -43,7 +43,6 @@ #include <sys/systm.h> #include <sys/file.h> #include <sys/pool.h> -#include <sys/buf.h> #include <sys/device.h> #include <sys/fcntl.h> diff --git a/sys/scsi/scsiconf.c b/sys/scsi/scsiconf.c index 14054377f15..f77a9b816a9 100644 --- a/sys/scsi/scsiconf.c +++ b/sys/scsi/scsiconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scsiconf.c,v 1.190 2015/02/11 00:50:03 dlg Exp $ */ +/* $OpenBSD: scsiconf.c,v 1.191 2015/03/14 03:38:52 jsg Exp $ */ /* $NetBSD: scsiconf.c,v 1.57 1996/05/02 01:09:01 neil Exp $ */ /* @@ -61,7 +61,6 @@ #include <scsi/scsi_all.h> #include <scsi/scsiconf.h> -#include <scsi/mpathvar.h> #if NBIO > 0 #include <sys/ioctl.h> diff --git a/sys/tmpfs/tmpfs_mem.c b/sys/tmpfs/tmpfs_mem.c index 59dcb6cbbfc..aaa321d9570 100644 --- a/sys/tmpfs/tmpfs_mem.c +++ b/sys/tmpfs/tmpfs_mem.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tmpfs_mem.c,v 1.6 2015/01/21 22:26:52 deraadt Exp $ */ +/* $OpenBSD: tmpfs_mem.c,v 1.7 2015/03/14 03:38:52 jsg Exp $ */ /* $NetBSD: tmpfs_mem.c,v 1.4 2011/05/24 01:09:47 rmind Exp $ */ /* @@ -39,7 +39,6 @@ #include <sys/namei.h> #include <sys/pool.h> #include <sys/vnode.h> -#include <sys/sysctl.h> #include <sys/malloc.h> #include <tmpfs/tmpfs.h> diff --git a/sys/tmpfs/tmpfs_vnops.c b/sys/tmpfs/tmpfs_vnops.c index becafc07915..4da35bf4544 100644 --- a/sys/tmpfs/tmpfs_vnops.c +++ b/sys/tmpfs/tmpfs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tmpfs_vnops.c,v 1.20 2015/02/10 21:56:10 miod Exp $ */ +/* $OpenBSD: tmpfs_vnops.c,v 1.21 2015/03/14 03:38:52 jsg Exp $ */ /* $NetBSD: tmpfs_vnops.c,v 1.100 2012/11/05 17:27:39 dholland Exp $ */ /* @@ -37,7 +37,6 @@ */ #include <sys/param.h> -#include <sys/dirent.h> #include <sys/fcntl.h> #include <sys/event.h> #include <sys/namei.h> diff --git a/sys/ufs/ext2fs/ext2fs_alloc.c b/sys/ufs/ext2fs/ext2fs_alloc.c index 205351d8e88..325ed17239a 100644 --- a/sys/ufs/ext2fs/ext2fs_alloc.c +++ b/sys/ufs/ext2fs/ext2fs_alloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ext2fs_alloc.c,v 1.34 2014/09/14 14:17:26 jsg Exp $ */ +/* $OpenBSD: ext2fs_alloc.c,v 1.35 2015/03/14 03:38:52 jsg Exp $ */ /* $NetBSD: ext2fs_alloc.c,v 1.10 2001/07/05 08:38:27 toshii Exp $ */ /* @@ -39,7 +39,6 @@ #include <sys/buf.h> #include <sys/vnode.h> #include <sys/mount.h> -#include <sys/kernel.h> #include <sys/syslog.h> #include <ufs/ufs/quota.h> diff --git a/sys/ufs/ext2fs/ext2fs_balloc.c b/sys/ufs/ext2fs/ext2fs_balloc.c index 7ae2a834c81..e8e9ab53b88 100644 --- a/sys/ufs/ext2fs/ext2fs_balloc.c +++ b/sys/ufs/ext2fs/ext2fs_balloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ext2fs_balloc.c,v 1.24 2014/09/14 14:17:26 jsg Exp $ */ +/* $OpenBSD: ext2fs_balloc.c,v 1.25 2015/03/14 03:38:52 jsg Exp $ */ /* $NetBSD: ext2fs_balloc.c,v 1.10 2001/07/04 21:16:01 chs Exp $ */ /* @@ -37,7 +37,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/buf.h> -#include <sys/file.h> #include <sys/vnode.h> #include <ufs/ufs/quota.h> diff --git a/sys/ufs/ext2fs/ext2fs_bmap.c b/sys/ufs/ext2fs/ext2fs_bmap.c index fa4e722f001..11a695aa5c1 100644 --- a/sys/ufs/ext2fs/ext2fs_bmap.c +++ b/sys/ufs/ext2fs/ext2fs_bmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ext2fs_bmap.c,v 1.25 2014/07/14 08:54:13 pelikan Exp $ */ +/* $OpenBSD: ext2fs_bmap.c,v 1.26 2015/03/14 03:38:52 jsg Exp $ */ /* $NetBSD: ext2fs_bmap.c,v 1.5 2000/03/30 12:41:11 augustss Exp $ */ /* @@ -45,7 +45,6 @@ #include <sys/proc.h> #include <sys/vnode.h> #include <sys/mount.h> -#include <sys/resourcevar.h> #include <sys/specdev.h> #include <ufs/ufs/quota.h> diff --git a/sys/ufs/ext2fs/ext2fs_extents.c b/sys/ufs/ext2fs/ext2fs_extents.c index 840a0259259..f9c86cb742e 100644 --- a/sys/ufs/ext2fs/ext2fs_extents.c +++ b/sys/ufs/ext2fs/ext2fs_extents.c @@ -34,7 +34,6 @@ #include <sys/vnode.h> #include <sys/mount.h> #include <sys/buf.h> -#include <sys/conf.h> #include <ufs/ufs/quota.h> #include <ufs/ufs/ufsmount.h> diff --git a/sys/ufs/ext2fs/ext2fs_inode.c b/sys/ufs/ext2fs/ext2fs_inode.c index 41d72bc6a31..97349af5fcd 100644 --- a/sys/ufs/ext2fs/ext2fs_inode.c +++ b/sys/ufs/ext2fs/ext2fs_inode.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ext2fs_inode.c,v 1.55 2014/07/31 17:37:52 pelikan Exp $ */ +/* $OpenBSD: ext2fs_inode.c,v 1.56 2015/03/14 03:38:52 jsg Exp $ */ /* $NetBSD: ext2fs_inode.c,v 1.24 2001/06/19 12:59:18 wiz Exp $ */ /* @@ -38,7 +38,6 @@ #include <sys/systm.h> #include <sys/mount.h> #include <sys/proc.h> -#include <sys/file.h> #include <sys/buf.h> #include <sys/vnode.h> #include <sys/kernel.h> diff --git a/sys/ufs/ext2fs/ext2fs_lookup.c b/sys/ufs/ext2fs/ext2fs_lookup.c index 8fe010f7f91..95ea6349009 100644 --- a/sys/ufs/ext2fs/ext2fs_lookup.c +++ b/sys/ufs/ext2fs/ext2fs_lookup.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ext2fs_lookup.c,v 1.38 2015/02/10 21:56:10 miod Exp $ */ +/* $OpenBSD: ext2fs_lookup.c,v 1.39 2015/03/14 03:38:52 jsg Exp $ */ /* $NetBSD: ext2fs_lookup.c,v 1.16 2000/08/03 20:29:26 thorpej Exp $ */ /* @@ -52,7 +52,6 @@ #include <sys/systm.h> #include <sys/namei.h> #include <sys/buf.h> -#include <sys/file.h> #include <sys/mount.h> #include <sys/vnode.h> #include <sys/malloc.h> diff --git a/sys/ufs/ext2fs/ext2fs_readwrite.c b/sys/ufs/ext2fs/ext2fs_readwrite.c index 598fbc753d5..5de9ac29880 100644 --- a/sys/ufs/ext2fs/ext2fs_readwrite.c +++ b/sys/ufs/ext2fs/ext2fs_readwrite.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ext2fs_readwrite.c,v 1.34 2015/02/10 21:56:10 miod Exp $ */ +/* $OpenBSD: ext2fs_readwrite.c,v 1.35 2015/03/14 03:38:52 jsg Exp $ */ /* $NetBSD: ext2fs_readwrite.c,v 1.16 2001/02/27 04:37:47 chs Exp $ */ /*- @@ -41,7 +41,6 @@ #include <sys/file.h> #include <sys/stat.h> #include <sys/buf.h> -#include <sys/conf.h> #include <sys/mount.h> #include <sys/vnode.h> #include <sys/malloc.h> diff --git a/sys/ufs/ext2fs/ext2fs_subr.c b/sys/ufs/ext2fs/ext2fs_subr.c index 57823855a56..de1a11fab53 100644 --- a/sys/ufs/ext2fs/ext2fs_subr.c +++ b/sys/ufs/ext2fs/ext2fs_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ext2fs_subr.c,v 1.32 2014/07/13 16:59:35 pelikan Exp $ */ +/* $OpenBSD: ext2fs_subr.c,v 1.33 2015/03/14 03:38:52 jsg Exp $ */ /* $NetBSD: ext2fs_subr.c,v 1.1 1997/06/11 09:34:03 bouyer Exp $ */ /* @@ -49,8 +49,6 @@ #include <ufs/ext2fs/ext2fs_extern.h> #include <ufs/ext2fs/ext2fs_extents.h> -#include <miscfs/fifofs/fifo.h> - union _qcvt { int64_t qcvt; int32_t val[2]; diff --git a/sys/ufs/ext2fs/ext2fs_vfsops.c b/sys/ufs/ext2fs/ext2fs_vfsops.c index 5ae5aaff413..f1b81e51b74 100644 --- a/sys/ufs/ext2fs/ext2fs_vfsops.c +++ b/sys/ufs/ext2fs/ext2fs_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ext2fs_vfsops.c,v 1.84 2014/12/23 01:53:33 tedu Exp $ */ +/* $OpenBSD: ext2fs_vfsops.c,v 1.85 2015/03/14 03:38:52 jsg Exp $ */ /* $NetBSD: ext2fs_vfsops.c,v 1.1 1997/06/11 09:34:07 bouyer Exp $ */ /* @@ -43,7 +43,6 @@ #include <sys/socket.h> #include <sys/mount.h> #include <sys/buf.h> -#include <sys/device.h> #include <sys/disk.h> #include <sys/mbuf.h> #include <sys/file.h> diff --git a/sys/ufs/ext2fs/ext2fs_vnops.c b/sys/ufs/ext2fs/ext2fs_vnops.c index 90750350230..c88e6f4617b 100644 --- a/sys/ufs/ext2fs/ext2fs_vnops.c +++ b/sys/ufs/ext2fs/ext2fs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ext2fs_vnops.c,v 1.71 2015/02/10 21:56:10 miod Exp $ */ +/* $OpenBSD: ext2fs_vnops.c,v 1.72 2015/03/14 03:38:52 jsg Exp $ */ /* $NetBSD: ext2fs_vnops.c,v 1.1 1997/06/11 09:34:09 bouyer Exp $ */ /* @@ -45,7 +45,6 @@ #include <sys/kernel.h> #include <sys/file.h> #include <sys/stat.h> -#include <sys/buf.h> #include <sys/proc.h> #include <sys/conf.h> #include <sys/mount.h> diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c index d49147f7925..2e63d12b64f 100644 --- a/sys/ufs/ffs/ffs_alloc.c +++ b/sys/ufs/ffs/ffs_alloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs_alloc.c,v 1.103 2014/11/18 02:37:31 tedu Exp $ */ +/* $OpenBSD: ffs_alloc.c,v 1.104 2015/03/14 03:38:52 jsg Exp $ */ /* $NetBSD: ffs_alloc.c,v 1.11 1996/05/11 18:27:09 mycroft Exp $ */ /* @@ -46,7 +46,6 @@ #include <sys/buf.h> #include <sys/vnode.h> #include <sys/mount.h> -#include <sys/kernel.h> #include <sys/syslog.h> #include <sys/stdint.h> #include <sys/time.h> diff --git a/sys/ufs/ffs/ffs_balloc.c b/sys/ufs/ffs/ffs_balloc.c index 032ce0cef62..e4b21cd3179 100644 --- a/sys/ufs/ffs/ffs_balloc.c +++ b/sys/ufs/ffs/ffs_balloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs_balloc.c,v 1.42 2014/07/08 17:19:26 deraadt Exp $ */ +/* $OpenBSD: ffs_balloc.c,v 1.43 2015/03/14 03:38:52 jsg Exp $ */ /* $NetBSD: ffs_balloc.c,v 1.3 1996/02/09 22:22:21 christos Exp $ */ /* @@ -45,7 +45,6 @@ #include <sys/systm.h> #include <sys/buf.h> #include <sys/proc.h> -#include <sys/file.h> #include <sys/mount.h> #include <sys/vnode.h> diff --git a/sys/ufs/ffs/ffs_inode.c b/sys/ufs/ffs/ffs_inode.c index 3a9efef099a..670a23e83a4 100644 --- a/sys/ufs/ffs/ffs_inode.c +++ b/sys/ufs/ffs/ffs_inode.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs_inode.c,v 1.73 2014/07/14 08:11:34 beck Exp $ */ +/* $OpenBSD: ffs_inode.c,v 1.74 2015/03/14 03:38:52 jsg Exp $ */ /* $NetBSD: ffs_inode.c,v 1.10 1996/05/11 18:27:19 mycroft Exp $ */ /* @@ -36,7 +36,6 @@ #include <sys/systm.h> #include <sys/mount.h> #include <sys/proc.h> -#include <sys/file.h> #include <sys/buf.h> #include <sys/vnode.h> #include <sys/kernel.h> diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index fe556ae5ff2..03b157769aa 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs_vfsops.c,v 1.148 2014/12/29 05:29:28 miod Exp $ */ +/* $OpenBSD: ffs_vfsops.c,v 1.149 2015/03/14 03:38:52 jsg Exp $ */ /* $NetBSD: ffs_vfsops.c,v 1.19 1996/02/09 22:22:26 christos Exp $ */ /* @@ -43,7 +43,6 @@ #include <sys/buf.h> #include <sys/mbuf.h> #include <sys/file.h> -#include <sys/disklabel.h> #include <sys/ioctl.h> #include <sys/errno.h> #include <sys/malloc.h> diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c index 8c50deba547..69cec454550 100644 --- a/sys/ufs/ffs/ffs_vnops.c +++ b/sys/ufs/ffs/ffs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs_vnops.c,v 1.79 2015/02/10 21:56:10 miod Exp $ */ +/* $OpenBSD: ffs_vnops.c,v 1.80 2015/03/14 03:38:52 jsg Exp $ */ /* $NetBSD: ffs_vnops.c,v 1.7 1996/05/11 18:27:24 mycroft Exp $ */ /* @@ -39,7 +39,6 @@ #include <sys/file.h> #include <sys/stat.h> #include <sys/buf.h> -#include <sys/conf.h> #include <sys/mount.h> #include <sys/vnode.h> #include <sys/malloc.h> diff --git a/sys/ufs/mfs/mfs_vfsops.c b/sys/ufs/mfs/mfs_vfsops.c index fc9d8dcdf0c..b6c966e78f4 100644 --- a/sys/ufs/mfs/mfs_vfsops.c +++ b/sys/ufs/mfs/mfs_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mfs_vfsops.c,v 1.47 2013/12/12 19:00:10 tedu Exp $ */ +/* $OpenBSD: mfs_vfsops.c,v 1.48 2015/03/14 03:38:52 jsg Exp $ */ /* $NetBSD: mfs_vfsops.c,v 1.10 1996/02/09 22:31:28 christos Exp $ */ /* @@ -35,7 +35,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/time.h> -#include <sys/kernel.h> #include <sys/proc.h> #include <sys/buf.h> #include <sys/mount.h> diff --git a/sys/ufs/mfs/mfs_vnops.c b/sys/ufs/mfs/mfs_vnops.c index c4a3b07c2b1..596f40efadc 100644 --- a/sys/ufs/mfs/mfs_vnops.c +++ b/sys/ufs/mfs/mfs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mfs_vnops.c,v 1.45 2014/07/12 18:44:01 tedu Exp $ */ +/* $OpenBSD: mfs_vnops.c,v 1.46 2015/03/14 03:38:52 jsg Exp $ */ /* $NetBSD: mfs_vnops.c,v 1.8 1996/03/17 02:16:32 christos Exp $ */ /* @@ -43,8 +43,6 @@ #include <sys/mount.h> #include <sys/specdev.h> -#include <machine/vmparam.h> - #include <ufs/mfs/mfsnode.h> #include <ufs/mfs/mfs_extern.h> diff --git a/sys/ufs/ufs/ufs_bmap.c b/sys/ufs/ufs/ufs_bmap.c index ca606b62bea..858f5fceb65 100644 --- a/sys/ufs/ufs/ufs_bmap.c +++ b/sys/ufs/ufs/ufs_bmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ufs_bmap.c,v 1.34 2013/11/01 17:36:19 krw Exp $ */ +/* $OpenBSD: ufs_bmap.c,v 1.35 2015/03/14 03:38:53 jsg Exp $ */ /* $NetBSD: ufs_bmap.c,v 1.3 1996/02/09 22:36:00 christos Exp $ */ /* @@ -43,7 +43,6 @@ #include <sys/proc.h> #include <sys/vnode.h> #include <sys/mount.h> -#include <sys/resourcevar.h> #include <sys/specdev.h> #include <ufs/ufs/quota.h> diff --git a/sys/ufs/ufs/ufs_dirhash.c b/sys/ufs/ufs/ufs_dirhash.c index c45a6ab0af0..44f9cac582e 100644 --- a/sys/ufs/ufs/ufs_dirhash.c +++ b/sys/ufs/ufs/ufs_dirhash.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ufs_dirhash.c,v 1.32 2014/12/23 01:53:34 tedu Exp $ */ +/* $OpenBSD: ufs_dirhash.c,v 1.33 2015/03/14 03:38:53 jsg Exp $ */ /* * Copyright (c) 2001, 2002 Ian Dowse. All rights reserved. * @@ -34,7 +34,6 @@ __FBSDID("$FreeBSD: src/sys/ufs/ufs/ufs_dirhash.c,v 1.18 2004/02/15 21:39:35 dwm #include <sys/param.h> #include <sys/systm.h> -#include <sys/kernel.h> #include <sys/lock.h> #include <sys/malloc.h> #include <sys/pool.h> diff --git a/sys/ufs/ufs/ufs_ihash.c b/sys/ufs/ufs/ufs_ihash.c index 3b634828fd8..6b26309fe9a 100644 --- a/sys/ufs/ufs/ufs_ihash.c +++ b/sys/ufs/ufs/ufs_ihash.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ufs_ihash.c,v 1.21 2015/01/09 05:01:57 tedu Exp $ */ +/* $OpenBSD: ufs_ihash.c,v 1.22 2015/03/14 03:38:53 jsg Exp $ */ /* $NetBSD: ufs_ihash.c,v 1.3 1996/02/09 22:36:04 christos Exp $ */ /* @@ -41,7 +41,6 @@ #include <ufs/ufs/inode.h> #include <ufs/ufs/ufs_extern.h> -#include <dev/rndvar.h> #include <crypto/siphash.h> /* diff --git a/sys/ufs/ufs/ufs_inode.c b/sys/ufs/ufs/ufs_inode.c index 8d17677ce88..43d7f96bd5d 100644 --- a/sys/ufs/ufs/ufs_inode.c +++ b/sys/ufs/ufs/ufs_inode.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ufs_inode.c,v 1.40 2014/09/14 14:17:27 jsg Exp $ */ +/* $OpenBSD: ufs_inode.c,v 1.41 2015/03/14 03:38:53 jsg Exp $ */ /* $NetBSD: ufs_inode.c,v 1.7 1996/05/11 18:27:52 mycroft Exp $ */ /* @@ -41,7 +41,6 @@ #include <sys/systm.h> #include <sys/vnode.h> #include <sys/mount.h> -#include <sys/kernel.h> #include <sys/malloc.h> #include <sys/namei.h> diff --git a/sys/ufs/ufs/ufs_lookup.c b/sys/ufs/ufs/ufs_lookup.c index d2386eed77c..f55afdfd509 100644 --- a/sys/ufs/ufs/ufs_lookup.c +++ b/sys/ufs/ufs/ufs_lookup.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ufs_lookup.c,v 1.46 2014/12/07 21:12:22 tedu Exp $ */ +/* $OpenBSD: ufs_lookup.c,v 1.47 2015/03/14 03:38:53 jsg Exp $ */ /* $NetBSD: ufs_lookup.c,v 1.7 1996/02/09 22:36:06 christos Exp $ */ /* @@ -42,7 +42,6 @@ #include <sys/kernel.h> #include <sys/namei.h> #include <sys/buf.h> -#include <sys/file.h> #include <sys/stat.h> #include <sys/mount.h> #include <sys/proc.h> diff --git a/sys/ufs/ufs/ufs_quota_stub.c b/sys/ufs/ufs/ufs_quota_stub.c index e6d98fefebd..ed7f8fefda0 100644 --- a/sys/ufs/ufs/ufs_quota_stub.c +++ b/sys/ufs/ufs/ufs_quota_stub.c @@ -1,11 +1,10 @@ -/* $OpenBSD: ufs_quota_stub.c,v 1.7 2014/09/14 14:17:27 jsg Exp $ */ +/* $OpenBSD: ufs_quota_stub.c,v 1.8 2015/03/14 03:38:53 jsg Exp $ */ #include <sys/param.h> #include <sys/kernel.h> #include <sys/systm.h> #include <sys/namei.h> #include <sys/malloc.h> -#include <sys/file.h> #include <sys/vnode.h> #include <sys/mount.h> diff --git a/sys/ufs/ufs/ufs_vfsops.c b/sys/ufs/ufs/ufs_vfsops.c index 0f0d7e2bd74..ad023402bab 100644 --- a/sys/ufs/ufs/ufs_vfsops.c +++ b/sys/ufs/ufs/ufs_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ufs_vfsops.c,v 1.18 2014/09/14 14:17:27 jsg Exp $ */ +/* $OpenBSD: ufs_vfsops.c,v 1.19 2015/03/14 03:38:53 jsg Exp $ */ /* $NetBSD: ufs_vfsops.c,v 1.4 1996/02/09 22:36:12 christos Exp $ */ /* @@ -40,7 +40,6 @@ #include <sys/param.h> #include <sys/mbuf.h> #include <sys/mount.h> -#include <sys/buf.h> #include <sys/vnode.h> #include <sys/malloc.h> #include <sys/specdev.h> diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index ecd91351eeb..13761130ce3 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ufs_vnops.c,v 1.119 2015/02/10 21:56:10 miod Exp $ */ +/* $OpenBSD: ufs_vnops.c,v 1.120 2015/03/14 03:38:53 jsg Exp $ */ /* $NetBSD: ufs_vnops.c,v 1.18 1996/05/11 18:28:04 mycroft Exp $ */ /* @@ -46,7 +46,6 @@ #include <sys/stat.h> #include <sys/buf.h> #include <sys/proc.h> -#include <sys/conf.h> #include <sys/mount.h> #include <sys/vnode.h> #include <sys/malloc.h> diff --git a/sys/uvm/uvm_device.c b/sys/uvm/uvm_device.c index cfdd845079f..0312110925e 100644 --- a/sys/uvm/uvm_device.c +++ b/sys/uvm/uvm_device.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_device.c,v 1.50 2014/11/16 12:31:00 deraadt Exp $ */ +/* $OpenBSD: uvm_device.c,v 1.51 2015/03/14 03:38:53 jsg Exp $ */ /* $NetBSD: uvm_device.c,v 1.30 2000/11/25 06:27:59 chs Exp $ */ /* @@ -37,7 +37,6 @@ #include <sys/conf.h> #include <sys/malloc.h> #include <sys/mutex.h> -#include <sys/vnode.h> #include <uvm/uvm.h> #include <uvm/uvm_device.h> diff --git a/sys/uvm/uvm_fault.c b/sys/uvm/uvm_fault.c index c1825482d70..2e6807ab553 100644 --- a/sys/uvm/uvm_fault.c +++ b/sys/uvm/uvm_fault.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_fault.c,v 1.83 2015/02/08 02:17:08 deraadt Exp $ */ +/* $OpenBSD: uvm_fault.c,v 1.84 2015/03/14 03:38:53 jsg Exp $ */ /* $NetBSD: uvm_fault.c,v 1.51 2000/08/06 00:22:53 thorpej Exp $ */ /* @@ -38,7 +38,6 @@ #include <sys/proc.h> #include <sys/malloc.h> #include <sys/mman.h> -#include <sys/user.h> #include <uvm/uvm.h> diff --git a/sys/uvm/uvm_init.c b/sys/uvm/uvm_init.c index 9217a09b0e0..9f8300976e0 100644 --- a/sys/uvm/uvm_init.c +++ b/sys/uvm/uvm_init.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_init.c,v 1.38 2015/02/07 08:21:24 miod Exp $ */ +/* $OpenBSD: uvm_init.c,v 1.39 2015/03/14 03:38:53 jsg Exp $ */ /* $NetBSD: uvm_init.c,v 1.14 2000/06/27 17:29:23 mrg Exp $ */ /* @@ -34,7 +34,6 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/file.h> #include <sys/filedesc.h> #include <sys/resourcevar.h> #include <sys/mman.h> diff --git a/sys/uvm/uvm_io.c b/sys/uvm/uvm_io.c index b93a04ff211..1d90c2c0bb4 100644 --- a/sys/uvm/uvm_io.c +++ b/sys/uvm/uvm_io.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_io.c,v 1.24 2015/02/10 21:56:10 miod Exp $ */ +/* $OpenBSD: uvm_io.c,v 1.25 2015/03/14 03:38:53 jsg Exp $ */ /* $NetBSD: uvm_io.c,v 1.12 2000/06/27 17:29:23 mrg Exp $ */ /* @@ -35,7 +35,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/mman.h> -#include <sys/malloc.h> #include <sys/uio.h> #include <uvm/uvm.h> diff --git a/sys/uvm/uvm_map.c b/sys/uvm/uvm_map.c index a067827562a..2323189738f 100644 --- a/sys/uvm/uvm_map.c +++ b/sys/uvm/uvm_map.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_map.c,v 1.187 2015/02/19 03:06:53 mlarkin Exp $ */ +/* $OpenBSD: uvm_map.c,v 1.188 2015/03/14 03:38:53 jsg Exp $ */ /* $NetBSD: uvm_map.c,v 1.86 2000/11/27 08:40:03 chs Exp $ */ /* @@ -90,7 +90,6 @@ #include <sys/proc.h> #include <sys/malloc.h> #include <sys/pool.h> -#include <sys/kernel.h> #include <sys/sysctl.h> #ifdef SYSVSHM diff --git a/sys/uvm/uvm_meter.c b/sys/uvm/uvm_meter.c index 42e2b13ed37..c10c1ce1727 100644 --- a/sys/uvm/uvm_meter.c +++ b/sys/uvm/uvm_meter.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_meter.c,v 1.35 2015/01/20 19:43:21 kettenis Exp $ */ +/* $OpenBSD: uvm_meter.c,v 1.36 2015/03/14 03:38:53 jsg Exp $ */ /* $NetBSD: uvm_meter.c,v 1.21 2001/07/14 06:36:03 matt Exp $ */ /* @@ -42,7 +42,6 @@ #include <sys/proc.h> #include <sys/sysctl.h> #include <sys/vmmeter.h> -#include <sys/exec.h> #include <uvm/uvm.h> #ifdef UVM_SWAP_ENCRYPT diff --git a/sys/uvm/uvm_page.c b/sys/uvm/uvm_page.c index a4c3770a957..f6fa0d283e8 100644 --- a/sys/uvm/uvm_page.c +++ b/sys/uvm/uvm_page.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_page.c,v 1.136 2015/02/28 06:11:04 mlarkin Exp $ */ +/* $OpenBSD: uvm_page.c,v 1.137 2015/03/14 03:38:53 jsg Exp $ */ /* $NetBSD: uvm_page.c,v 1.44 2000/11/27 08:40:04 chs Exp $ */ /* @@ -69,7 +69,6 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/sched.h> -#include <sys/kernel.h> #include <sys/vnode.h> #include <sys/mount.h> #include <sys/proc.h> diff --git a/sys/uvm/uvm_swap_encrypt.c b/sys/uvm/uvm_swap_encrypt.c index 3e6232090ee..ba3cd294bff 100644 --- a/sys/uvm/uvm_swap_encrypt.c +++ b/sys/uvm/uvm_swap_encrypt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_swap_encrypt.c,v 1.19 2014/11/18 02:37:31 tedu Exp $ */ +/* $OpenBSD: uvm_swap_encrypt.c,v 1.20 2015/03/14 03:38:53 jsg Exp $ */ /* * Copyright 1999 Niels Provos <provos@citi.umich.edu> @@ -36,7 +36,6 @@ #include <sys/malloc.h> #include <sys/sysctl.h> #include <sys/time.h> -#include <sys/conf.h> #include <crypto/rijndael.h> #include <uvm/uvm.h> diff --git a/sys/uvm/uvm_vnode.c b/sys/uvm/uvm_vnode.c index 3422e1eef30..a8d3990562e 100644 --- a/sys/uvm/uvm_vnode.c +++ b/sys/uvm/uvm_vnode.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_vnode.c,v 1.88 2014/12/18 23:59:28 tedu Exp $ */ +/* $OpenBSD: uvm_vnode.c,v 1.89 2015/03/14 03:38:53 jsg Exp $ */ /* $NetBSD: uvm_vnode.c,v 1.36 2000/11/24 20:34:01 chs Exp $ */ /* @@ -52,7 +52,6 @@ #include <sys/vnode.h> #include <sys/lock.h> #include <sys/disklabel.h> -#include <sys/ioctl.h> #include <sys/fcntl.h> #include <sys/conf.h> #include <sys/rwlock.h> |