summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/dev/acpi/acpi.c3
-rw-r--r--sys/dev/cardbus/if_rtw_cardbus.c3
-rw-r--r--sys/dev/ic/acx111.c4
-rw-r--r--sys/dev/pci/yds.c3
-rw-r--r--sys/dev/usb/moscom.c3
-rw-r--r--sys/dev/usb/uark.c3
-rw-r--r--sys/dev/usb/uaudio.c3
-rw-r--r--sys/dev/usb/umct.c3
-rw-r--r--sys/dev/usb/uplcom.c3
-rw-r--r--sys/dev/usb/uscom.c3
-rw-r--r--sys/dev/usb/uslcom.c3
-rw-r--r--sys/dev/usb/uvideo.c3
-rw-r--r--sys/kern/tty_pty.c3
-rw-r--r--sys/lib/libsa/net.c3
-rw-r--r--sys/netinet6/in6_ifattach.c3
-rw-r--r--sys/ntfs/ntfs_vfsops.c3
-rw-r--r--sys/uvm/uvm_aobj.c3
17 files changed, 17 insertions, 35 deletions
diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c
index 7015c2ce7e5..37b092787de 100644
--- a/sys/dev/acpi/acpi.c
+++ b/sys/dev/acpi/acpi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpi.c,v 1.273 2014/11/08 07:45:10 mlarkin Exp $ */
+/* $OpenBSD: acpi.c,v 1.274 2014/11/18 23:55:01 krw Exp $ */
/*
* Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com>
* Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org>
@@ -47,7 +47,6 @@
#include <dev/acpi/dsdt.h>
#include <dev/wscons/wsdisplayvar.h>
-#include <dev/pci/pcivar.h>
#include <dev/pci/pcidevs.h>
#include <dev/pci/ppbreg.h>
diff --git a/sys/dev/cardbus/if_rtw_cardbus.c b/sys/dev/cardbus/if_rtw_cardbus.c
index 2a8537f821b..0e98c26ddc8 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.21 2012/12/05 23:20:16 deraadt Exp $ */
+/* $OpenBSD: if_rtw_cardbus.c,v 1.22 2014/11/18 23:55:01 krw Exp $ */
/* $NetBSD: if_rtw_cardbus.c,v 1.4 2004/12/20 21:05:34 dyoung Exp $ */
/*-
@@ -107,7 +107,6 @@
#include <dev/pci/pcidevs.h>
#include <dev/cardbus/cardbusvar.h>
-#include <dev/pci/pcidevs.h>
/*
* PCI configuration space registers used by the RTL8180.
diff --git a/sys/dev/ic/acx111.c b/sys/dev/ic/acx111.c
index 8cd5696edb1..6274bc74760 100644
--- a/sys/dev/ic/acx111.c
+++ b/sys/dev/ic/acx111.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acx111.c,v 1.20 2014/09/25 04:19:45 jsg Exp $ */
+/* $OpenBSD: acx111.c,v 1.21 2014/11/18 23:55:01 krw Exp $ */
/*
* Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -64,8 +64,6 @@
#include <net/if_arp.h>
#include <net/if_media.h>
-#include <net/if.h>
-
#ifdef INET
#include <netinet/in.h>
#include <netinet/if_ether.h>
diff --git a/sys/dev/pci/yds.c b/sys/dev/pci/yds.c
index 61158ea5e26..e235705cb82 100644
--- a/sys/dev/pci/yds.c
+++ b/sys/dev/pci/yds.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: yds.c,v 1.47 2014/07/12 18:48:52 tedu Exp $ */
+/* $OpenBSD: yds.c,v 1.48 2014/11/18 23:55:01 krw Exp $ */
/* $NetBSD: yds.c,v 1.5 2001/05/21 23:55:04 minoura Exp $ */
/*
@@ -46,7 +46,6 @@
#include <sys/malloc.h>
#include <sys/device.h>
#include <sys/queue.h>
-#include <sys/fcntl.h>
#include <dev/pci/pcidevs.h>
#include <dev/pci/pcireg.h>
diff --git a/sys/dev/usb/moscom.c b/sys/dev/usb/moscom.c
index bc2b55855d0..60975c7136c 100644
--- a/sys/dev/usb/moscom.c
+++ b/sys/dev/usb/moscom.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: moscom.c,v 1.20 2014/07/12 21:24:33 mpi Exp $ */
+/* $OpenBSD: moscom.c,v 1.21 2014/11/18 23:55:01 krw Exp $ */
/*
* Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -28,7 +28,6 @@
#include <dev/usb/usbdi_util.h>
#include <dev/usb/usbdevs.h>
-#include <dev/usb/usbdevs.h>
#include <dev/usb/ucomvar.h>
#define MOSCOMBUFSZ 256
diff --git a/sys/dev/usb/uark.c b/sys/dev/usb/uark.c
index 70e9067901a..8e9875c3585 100644
--- a/sys/dev/usb/uark.c
+++ b/sys/dev/usb/uark.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uark.c,v 1.20 2014/07/12 20:26:33 mpi Exp $ */
+/* $OpenBSD: uark.c,v 1.21 2014/11/18 23:55:01 krw Exp $ */
/*
* Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -28,7 +28,6 @@
#include <dev/usb/usbdi_util.h>
#include <dev/usb/usbdevs.h>
-#include <dev/usb/usbdevs.h>
#include <dev/usb/ucomvar.h>
#ifdef UARK_DEBUG
diff --git a/sys/dev/usb/uaudio.c b/sys/dev/usb/uaudio.c
index f942613ab93..062d519cc17 100644
--- a/sys/dev/usb/uaudio.c
+++ b/sys/dev/usb/uaudio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uaudio.c,v 1.105 2014/08/21 14:52:55 mpi Exp $ */
+/* $OpenBSD: uaudio.c,v 1.106 2014/11/18 23:55:01 krw Exp $ */
/* $NetBSD: uaudio.c,v 1.90 2004/10/29 17:12:53 kent Exp $ */
/*
@@ -46,7 +46,6 @@
#include <sys/tty.h>
#include <sys/file.h>
#include <sys/selinfo.h>
-#include <sys/device.h>
#include <sys/poll.h>
#include <machine/bus.h>
diff --git a/sys/dev/usb/umct.c b/sys/dev/usb/umct.c
index 229a2958e8b..2bed5de30e5 100644
--- a/sys/dev/usb/umct.c
+++ b/sys/dev/usb/umct.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: umct.c,v 1.41 2014/07/12 20:26:33 mpi Exp $ */
+/* $OpenBSD: umct.c,v 1.42 2014/11/18 23:55:01 krw Exp $ */
/* $NetBSD: umct.c,v 1.10 2003/02/23 04:20:07 simonb Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -55,7 +55,6 @@
#include <dev/usb/usbdevs.h>
#include <dev/usb/usb_quirks.h>
-#include <dev/usb/usbdevs.h>
#include <dev/usb/ucomvar.h>
#include <dev/usb/umct.h>
diff --git a/sys/dev/usb/uplcom.c b/sys/dev/usb/uplcom.c
index 001b0950ef4..b6088feb4e2 100644
--- a/sys/dev/usb/uplcom.c
+++ b/sys/dev/usb/uplcom.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uplcom.c,v 1.64 2014/07/12 21:24:33 mpi Exp $ */
+/* $OpenBSD: uplcom.c,v 1.65 2014/11/18 23:55:01 krw Exp $ */
/* $NetBSD: uplcom.c,v 1.29 2002/09/23 05:51:23 simonb Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -57,7 +57,6 @@
#include <dev/usb/usbdevs.h>
#include <dev/usb/usb_quirks.h>
-#include <dev/usb/usbdevs.h>
#include <dev/usb/ucomvar.h>
#ifdef UPLCOM_DEBUG
diff --git a/sys/dev/usb/uscom.c b/sys/dev/usb/uscom.c
index 893fef10c37..ae78142da50 100644
--- a/sys/dev/usb/uscom.c
+++ b/sys/dev/usb/uscom.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uscom.c,v 1.2 2014/07/12 21:24:33 mpi Exp $ */
+/* $OpenBSD: uscom.c,v 1.3 2014/11/18 23:55:01 krw Exp $ */
/*
* Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -28,7 +28,6 @@
#include <dev/usb/usbdi_util.h>
#include <dev/usb/usbdevs.h>
-#include <dev/usb/usbdevs.h>
#include <dev/usb/ucomvar.h>
#define USCOMBUFSZ 256
diff --git a/sys/dev/usb/uslcom.c b/sys/dev/usb/uslcom.c
index c0c421206b7..1ce0732d4ca 100644
--- a/sys/dev/usb/uslcom.c
+++ b/sys/dev/usb/uslcom.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uslcom.c,v 1.31 2014/07/12 21:24:33 mpi Exp $ */
+/* $OpenBSD: uslcom.c,v 1.32 2014/11/18 23:55:01 krw Exp $ */
/*
* Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -28,7 +28,6 @@
#include <dev/usb/usbdi_util.h>
#include <dev/usb/usbdevs.h>
-#include <dev/usb/usbdevs.h>
#include <dev/usb/ucomvar.h>
#ifdef USLCOM_DEBUG
diff --git a/sys/dev/usb/uvideo.c b/sys/dev/usb/uvideo.c
index 512723f35ba..4f3d33eeec8 100644
--- a/sys/dev/usb/uvideo.c
+++ b/sys/dev/usb/uvideo.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uvideo.c,v 1.177 2014/10/23 07:34:48 brad Exp $ */
+/* $OpenBSD: uvideo.c,v 1.178 2014/11/18 23:55:01 krw Exp $ */
/*
* Copyright (c) 2008 Robert Nagy <robert@openbsd.org>
@@ -28,7 +28,6 @@
#include <sys/selinfo.h>
#include <sys/lock.h>
#include <sys/stat.h>
-#include <sys/device.h>
#include <sys/poll.h>
#include <sys/timeout.h>
#include <sys/kthread.h>
diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c
index e28a641c5ae..2c64ccf885c 100644
--- a/sys/kern/tty_pty.c
+++ b/sys/kern/tty_pty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty_pty.c,v 1.68 2014/07/13 15:29:04 tedu Exp $ */
+/* $OpenBSD: tty_pty.c,v 1.69 2014/11/18 23:55:01 krw Exp $ */
/* $NetBSD: tty_pty.c,v 1.33.4.1 1996/06/02 09:08:11 mrg Exp $ */
/*
@@ -51,7 +51,6 @@
#include <sys/malloc.h>
#include <sys/vnode.h>
#include <sys/signalvar.h>
-#include <sys/uio.h>
#include <sys/conf.h>
#include <sys/stat.h>
#include <sys/sysctl.h>
diff --git a/sys/lib/libsa/net.c b/sys/lib/libsa/net.c
index 1073dad6e01..d3a7119dafc 100644
--- a/sys/lib/libsa/net.c
+++ b/sys/lib/libsa/net.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: net.c,v 1.14 2014/07/13 15:31:20 mpi Exp $ */
+/* $OpenBSD: net.c,v 1.15 2014/11/18 23:55:01 krw Exp $ */
/* $NetBSD: net.c,v 1.14 1996/10/13 02:29:02 christos Exp $ */
/*
@@ -46,7 +46,6 @@
#include <net/if.h>
#include <netinet/in.h>
-#include <netinet/in.h>
#include <netinet/if_ether.h>
#include <netinet/ip.h>
#include <netinet/ip_var.h>
diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c
index f3f09cf791a..2a50c27f3ea 100644
--- a/sys/netinet6/in6_ifattach.c
+++ b/sys/netinet6/in6_ifattach.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: in6_ifattach.c,v 1.75 2014/11/18 02:37:31 tedu Exp $ */
+/* $OpenBSD: in6_ifattach.c,v 1.76 2014/11/18 23:55:01 krw Exp $ */
/* $KAME: in6_ifattach.c,v 1.124 2001/07/18 08:32:51 jinmei Exp $ */
/*
@@ -52,7 +52,6 @@
#include <netinet/ip6.h>
#include <netinet6/ip6_var.h>
#include <netinet6/in6_ifattach.h>
-#include <netinet6/ip6_var.h>
#include <netinet6/nd6.h>
#ifdef MROUTING
#include <netinet6/ip6_mroute.h>
diff --git a/sys/ntfs/ntfs_vfsops.c b/sys/ntfs/ntfs_vfsops.c
index 11d2da2976c..099d0c0d381 100644
--- a/sys/ntfs/ntfs_vfsops.c
+++ b/sys/ntfs/ntfs_vfsops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ntfs_vfsops.c,v 1.40 2014/07/12 18:43:52 tedu Exp $ */
+/* $OpenBSD: ntfs_vfsops.c,v 1.41 2014/11/18 23:55:01 krw Exp $ */
/* $NetBSD: ntfs_vfsops.c,v 1.7 2003/04/24 07:50:19 christos Exp $ */
/*-
@@ -40,7 +40,6 @@
#include <sys/disk.h>
#include <sys/fcntl.h>
#include <sys/malloc.h>
-#include <sys/systm.h>
#include <sys/device.h>
#include <sys/conf.h>
#include <sys/specdev.h>
diff --git a/sys/uvm/uvm_aobj.c b/sys/uvm/uvm_aobj.c
index f4d9addc226..3601b91922b 100644
--- a/sys/uvm/uvm_aobj.c
+++ b/sys/uvm/uvm_aobj.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uvm_aobj.c,v 1.70 2014/11/16 12:31:00 deraadt Exp $ */
+/* $OpenBSD: uvm_aobj.c,v 1.71 2014/11/18 23:55:01 krw Exp $ */
/* $NetBSD: uvm_aobj.c,v 1.39 2001/02/18 21:19:08 chs Exp $ */
/*
@@ -42,7 +42,6 @@
#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/pool.h>
-#include <sys/kernel.h>
#include <sys/stdint.h>
#include <uvm/uvm.h>