summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2012-12-05 23:20:27 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2012-12-05 23:20:27 +0000
commit0275dcbbe75bf604e5d9b03f215e510188a36496 (patch)
tree5c28b494f1e6a54c80a5317abfe2c32e13cbbdc5 /sys/dev
parent56b74e8e5b53b78f8c539afa3b9581be53b79e06 (diff)
Remove excessive sys/cdefs.h inclusion
ok guenther millert kettenis
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/cardbus/if_rtw_cardbus.c4
-rw-r--r--sys/dev/ic/acx.c3
-rw-r--r--sys/dev/ic/aic79xx.c4
-rw-r--r--sys/dev/ic/aic79xx_openbsd.c7
-rw-r--r--sys/dev/ic/aic7xxx.c7
-rw-r--r--sys/dev/ic/an.c4
-rw-r--r--sys/dev/ic/bwi.c3
-rw-r--r--sys/dev/ic/malo.c3
-rw-r--r--sys/dev/ic/pgt.c3
-rw-r--r--sys/dev/ic/rtw.c3
-rw-r--r--sys/dev/microcode/aic7xxx/aicasm.c5
-rw-r--r--sys/dev/microcode/aic7xxx/aicasm_symbol.c3
-rw-r--r--sys/dev/pci/ahd_pci.c7
-rw-r--r--sys/dev/pci/if_bnx.c7
-rw-r--r--sys/dev/pci/if_em_hw.c7
-rw-r--r--sys/dev/pci/if_rtw_pci.c3
-rw-r--r--sys/dev/pci/if_vio.c3
-rw-r--r--sys/dev/pci/mmuagp.c2
-rw-r--r--sys/dev/pci/safe.c4
-rw-r--r--sys/dev/pci/vioblk.c3
-rw-r--r--sys/dev/pci/virtio.c4
-rw-r--r--sys/dev/pci/virtio_pci.c4
-rw-r--r--sys/dev/sbus/if_le_lebuffer.c3
-rw-r--r--sys/dev/sbus/lebuffer.c3
-rw-r--r--sys/dev/usb/if_axe.c4
-rw-r--r--sys/dev/usb/if_mos.c4
-rw-r--r--sys/dev/usb/if_udav.c4
-rw-r--r--sys/dev/usb/if_urndis.c4
-rw-r--r--sys/dev/usb/ubsa.c4
-rw-r--r--sys/dev/vesa/vesabios.c4
-rw-r--r--sys/dev/videomode/edid.c3
-rw-r--r--sys/dev/videomode/modelines2c.awk4
-rw-r--r--sys/dev/videomode/vesagtf.c2
-rw-r--r--sys/dev/videomode/videomode.c3
-rw-r--r--sys/dev/wscons/wsevent.c4
-rw-r--r--sys/dev/wscons/wskbdutil.c3
36 files changed, 36 insertions, 106 deletions
diff --git a/sys/dev/cardbus/if_rtw_cardbus.c b/sys/dev/cardbus/if_rtw_cardbus.c
index 77a46a094b3..2a8537f821b 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.20 2011/04/02 17:47:04 jasper Exp $ */
+/* $OpenBSD: if_rtw_cardbus.c,v 1.21 2012/12/05 23:20:16 deraadt Exp $ */
/* $NetBSD: if_rtw_cardbus.c,v 1.4 2004/12/20 21:05:34 dyoung Exp $ */
/*-
@@ -67,8 +67,6 @@
* TBD factor with atw, tlp Cardbus front-ends?
*/
-#include <sys/cdefs.h>
-
#include "bpfilter.h"
#include <sys/param.h>
diff --git a/sys/dev/ic/acx.c b/sys/dev/ic/acx.c
index 900e44696bd..be26e6fa4a7 100644
--- a/sys/dev/ic/acx.c
+++ b/sys/dev/ic/acx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acx.c,v 1.98 2012/10/27 16:13:28 claudio Exp $ */
+/* $OpenBSD: acx.c,v 1.99 2012/12/05 23:20:16 deraadt Exp $ */
/*
* Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -86,7 +86,6 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include "bpfilter.h"
#include <sys/param.h>
diff --git a/sys/dev/ic/aic79xx.c b/sys/dev/ic/aic79xx.c
index d0aa0b0e21d..6fed99b0324 100644
--- a/sys/dev/ic/aic79xx.c
+++ b/sys/dev/ic/aic79xx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aic79xx.c,v 1.49 2012/02/24 06:19:00 guenther Exp $ */
+/* $OpenBSD: aic79xx.c,v 1.50 2012/12/05 23:20:16 deraadt Exp $ */
/*
* Copyright (c) 2004 Milos Urbanek, Kenneth R. Westerback & Marco Peereboom
@@ -71,8 +71,6 @@
* FreeBSD: src/sys/dev/aic7xxx/aic79xx.c,v 1.33 2004/11/18 20:22:30 gibbs Exp
*/
-#include <sys/cdefs.h>
-
#include <dev/ic/aic79xx_openbsd.h>
#include <dev/ic/aic79xx_inline.h>
#include <dev/ic/aic79xx.h>
diff --git a/sys/dev/ic/aic79xx_openbsd.c b/sys/dev/ic/aic79xx_openbsd.c
index 8638f0c5c25..a2184e4c593 100644
--- a/sys/dev/ic/aic79xx_openbsd.c
+++ b/sys/dev/ic/aic79xx_openbsd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aic79xx_openbsd.c,v 1.38 2012/02/24 06:19:00 guenther Exp $ */
+/* $OpenBSD: aic79xx_openbsd.c,v 1.39 2012/12/05 23:20:16 deraadt Exp $ */
/*
* Copyright (c) 2004 Milos Urbanek, Kenneth R. Westerback & Marco Peereboom
@@ -60,11 +60,6 @@
*
*/
-#include <sys/cdefs.h>
-/*
-__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic79xx_osm.c,v 1.16 2003/12/17 00:02:09 gibbs Exp $");
-*/
-
#include <dev/ic/aic79xx_openbsd.h>
#include <dev/ic/aic79xx_inline.h>
#include <dev/ic/aic79xx.h>
diff --git a/sys/dev/ic/aic7xxx.c b/sys/dev/ic/aic7xxx.c
index 16ae5dcbb11..871ce82378b 100644
--- a/sys/dev/ic/aic7xxx.c
+++ b/sys/dev/ic/aic7xxx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aic7xxx.c,v 1.84 2010/03/14 14:37:01 krw Exp $ */
+/* $OpenBSD: aic7xxx.c,v 1.85 2012/12/05 23:20:16 deraadt Exp $ */
/* $NetBSD: aic7xxx.c,v 1.108 2003/11/02 11:07:44 wiz Exp $ */
/*
@@ -40,15 +40,12 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGES.
*
- * $Id: aic7xxx.c,v 1.84 2010/03/14 14:37:01 krw Exp $
+ * $Id: aic7xxx.c,v 1.85 2012/12/05 23:20:16 deraadt Exp $
*/
/*
* Ported from FreeBSD by Pascal Renauld, Network Storage Solutions, Inc. - April 2003
*/
-#include <sys/cdefs.h>
-/* __FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic7xxx.c,v 1.100 2004/05/11 20:39:46 gibbs Exp $"); */
-
#include <dev/ic/aic7xxx_openbsd.h>
#ifdef SMALL_KERNEL
#define IO_EXPAND
diff --git a/sys/dev/ic/an.c b/sys/dev/ic/an.c
index 244a2f5c809..0c5879b685a 100644
--- a/sys/dev/ic/an.c
+++ b/sys/dev/ic/an.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: an.c,v 1.58 2010/08/27 17:08:00 jsg Exp $ */
+/* $OpenBSD: an.c,v 1.59 2012/12/05 23:20:16 deraadt Exp $ */
/* $NetBSD: an.c,v 1.34 2005/06/20 02:49:18 atatat Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -77,8 +77,6 @@
* IETF meeting.
*/
-#include <sys/cdefs.h>
-
#include "bpfilter.h"
#include <sys/param.h>
diff --git a/sys/dev/ic/bwi.c b/sys/dev/ic/bwi.c
index 89be52d8cdd..75ae03f29b4 100644
--- a/sys/dev/ic/bwi.c
+++ b/sys/dev/ic/bwi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bwi.c,v 1.95 2010/08/27 17:08:00 jsg Exp $ */
+/* $OpenBSD: bwi.c,v 1.96 2012/12/05 23:20:16 deraadt Exp $ */
/*
* Copyright (c) 2007 The DragonFly Project. All rights reserved.
@@ -38,7 +38,6 @@
#include "bpfilter.h"
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/types.h>
diff --git a/sys/dev/ic/malo.c b/sys/dev/ic/malo.c
index b86af946cae..d0536987a47 100644
--- a/sys/dev/ic/malo.c
+++ b/sys/dev/ic/malo.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: malo.c,v 1.94 2012/09/04 19:01:33 claudio Exp $ */
+/* $OpenBSD: malo.c,v 1.95 2012/12/05 23:20:18 deraadt Exp $ */
/*
* Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org>
@@ -19,7 +19,6 @@
#include "bpfilter.h"
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/types.h>
diff --git a/sys/dev/ic/pgt.c b/sys/dev/ic/pgt.c
index 719a945364c..692b72c9bec 100644
--- a/sys/dev/ic/pgt.c
+++ b/sys/dev/ic/pgt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pgt.c,v 1.68 2011/12/01 23:34:08 miod Exp $ */
+/* $OpenBSD: pgt.c,v 1.69 2012/12/05 23:20:18 deraadt Exp $ */
/*
* Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org>
@@ -44,7 +44,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include "bpfilter.h"
#include <sys/param.h>
diff --git a/sys/dev/ic/rtw.c b/sys/dev/ic/rtw.c
index 9c5abba8312..f79999753b8 100644
--- a/sys/dev/ic/rtw.c
+++ b/sys/dev/ic/rtw.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rtw.c,v 1.81 2010/09/07 16:21:43 deraadt Exp $ */
+/* $OpenBSD: rtw.c,v 1.82 2012/12/05 23:20:19 deraadt Exp $ */
/* $NetBSD: rtw.c,v 1.29 2004/12/27 19:49:16 dyoung Exp $ */
/*-
@@ -35,7 +35,6 @@
* Device driver for the Realtek RTL8180 802.11 MAC/BBP.
*/
-#include <sys/cdefs.h>
#include "bpfilter.h"
#include <sys/param.h>
diff --git a/sys/dev/microcode/aic7xxx/aicasm.c b/sys/dev/microcode/aic7xxx/aicasm.c
index aa6fb679c69..a9d90a1061f 100644
--- a/sys/dev/microcode/aic7xxx/aicasm.c
+++ b/sys/dev/microcode/aic7xxx/aicasm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aicasm.c,v 1.14 2005/10/04 23:46:14 krw Exp $ */
+/* $OpenBSD: aicasm.c,v 1.15 2012/12/05 23:20:19 deraadt Exp $ */
/*
* Aic7xxx SCSI host adapter firmware asssembler
*
@@ -38,11 +38,10 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGES.
*
- * $Id: aicasm.c,v 1.14 2005/10/04 23:46:14 krw Exp $
+ * $Id: aicasm.c,v 1.15 2012/12/05 23:20:19 deraadt Exp $
*
* $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm.c,v 1.37 2004/03/12 21:45:25 trhodes Exp $
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/mman.h>
diff --git a/sys/dev/microcode/aic7xxx/aicasm_symbol.c b/sys/dev/microcode/aic7xxx/aicasm_symbol.c
index dd9d4945c26..7b3c2a8f3a0 100644
--- a/sys/dev/microcode/aic7xxx/aicasm_symbol.c
+++ b/sys/dev/microcode/aic7xxx/aicasm_symbol.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aicasm_symbol.c,v 1.10 2009/10/28 23:22:45 schwarze Exp $ */
+/* $OpenBSD: aicasm_symbol.c,v 1.11 2012/12/05 23:20:19 deraadt Exp $ */
/* $NetBSD: aicasm_symbol.c,v 1.4 2003/07/14 15:42:40 lukem Exp $ */
/*
@@ -43,7 +43,6 @@
* $FreeBSD: src/sys/dev/aic7xxx/aicasm/aicasm_symbol.c,v 1.23 2003/01/20 18:01:37 gibbs Exp $
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#ifdef __linux__
diff --git a/sys/dev/pci/ahd_pci.c b/sys/dev/pci/ahd_pci.c
index 343b951265f..6c89c339181 100644
--- a/sys/dev/pci/ahd_pci.c
+++ b/sys/dev/pci/ahd_pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ahd_pci.c,v 1.20 2012/09/30 21:46:09 brad Exp $ */
+/* $OpenBSD: ahd_pci.c,v 1.21 2012/12/05 23:20:19 deraadt Exp $ */
/*
* Copyright (c) 2004 Milos Urbanek, Kenneth R. Westerback & Marco Peereboom
@@ -69,11 +69,6 @@
*
*/
-#include <sys/cdefs.h>
-/*
-__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/aic79xx_pci.c,v 1.18 2004/02/04 16:38:38 gibbs Exp $");
-*/
-
#include <dev/ic/aic79xx_openbsd.h>
#include <dev/ic/aic79xx_inline.h>
#include <dev/ic/aic79xx.h>
diff --git a/sys/dev/pci/if_bnx.c b/sys/dev/pci/if_bnx.c
index 2b64fb1eaa6..0807d013996 100644
--- a/sys/dev/pci/if_bnx.c
+++ b/sys/dev/pci/if_bnx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_bnx.c,v 1.97 2012/07/05 13:50:15 phessler Exp $ */
+/* $OpenBSD: if_bnx.c,v 1.98 2012/12/05 23:20:20 deraadt Exp $ */
/*-
* Copyright (c) 2006 Broadcom Corporation
@@ -30,11 +30,6 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if 0
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.3 2006/04/13 14:12:26 ru Exp $");
-#endif
-
/*
* The following controllers are supported by this driver:
* BCM5706C A2, A3
diff --git a/sys/dev/pci/if_em_hw.c b/sys/dev/pci/if_em_hw.c
index 120729cdec3..a63d2dca9d7 100644
--- a/sys/dev/pci/if_em_hw.c
+++ b/sys/dev/pci/if_em_hw.c
@@ -31,16 +31,11 @@
*******************************************************************************/
-/* $OpenBSD: if_em_hw.c,v 1.70 2012/11/26 01:17:41 jsg Exp $ */
+/* $OpenBSD: if_em_hw.c,v 1.71 2012/12/05 23:20:20 deraadt Exp $ */
/*
* if_em_hw.c Shared functions for accessing and configuring the MAC
*/
-#if 0
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: if_em_hw.c,v 1.16 2005/05/26 23:32:02 tackerman Exp $");
-#endif
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/sockio.h>
diff --git a/sys/dev/pci/if_rtw_pci.c b/sys/dev/pci/if_rtw_pci.c
index 230cce32364..aafad4db5b2 100644
--- a/sys/dev/pci/if_rtw_pci.c
+++ b/sys/dev/pci/if_rtw_pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_rtw_pci.c,v 1.16 2012/10/18 21:44:21 deraadt Exp $ */
+/* $OpenBSD: if_rtw_pci.c,v 1.17 2012/12/05 23:20:20 deraadt Exp $ */
/* $NetBSD: if_rtw_pci.c,v 1.1 2004/09/26 02:33:36 dyoung Exp $ */
/*-
@@ -39,7 +39,6 @@
* Derived from the ``Tulip'' PCI bus front-end.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/mbuf.h>
diff --git a/sys/dev/pci/if_vio.c b/sys/dev/pci/if_vio.c
index f4444871f23..706f99dcd74 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.8 2012/12/03 21:04:49 sf Exp $ */
+/* $OpenBSD: if_vio.c,v 1.9 2012/12/05 23:20:20 deraadt Exp $ */
/*
* Copyright (c) 2012 Stefan Fritsch, Alexander Fiveg.
@@ -26,7 +26,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include "bpfilter.h"
#include <sys/param.h>
diff --git a/sys/dev/pci/mmuagp.c b/sys/dev/pci/mmuagp.c
index f467c305197..f1a31cc6834 100644
--- a/sys/dev/pci/mmuagp.c
+++ b/sys/dev/pci/mmuagp.c
@@ -24,8 +24,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
diff --git a/sys/dev/pci/safe.c b/sys/dev/pci/safe.c
index 4b3441b2b17..451648e2e89 100644
--- a/sys/dev/pci/safe.c
+++ b/sys/dev/pci/safe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: safe.c,v 1.34 2012/01/13 09:53:24 mikeb Exp $ */
+/* $OpenBSD: safe.c,v 1.35 2012/12/05 23:20:20 deraadt Exp $ */
/*-
* Copyright (c) 2003 Sam Leffler, Errno Consulting
@@ -29,8 +29,6 @@
* $FreeBSD: /repoman/r/ncvs/src/sys/dev/safe/safe.c,v 1.1 2003/07/21 21:46:07 sam Exp $
*/
-#include <sys/cdefs.h>
-
/*
* SafeNet SafeXcel-1141 hardware crypto accelerator
*/
diff --git a/sys/dev/pci/vioblk.c b/sys/dev/pci/vioblk.c
index de549fe1965..6fdbf797ba8 100644
--- a/sys/dev/pci/vioblk.c
+++ b/sys/dev/pci/vioblk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vioblk.c,v 1.2 2012/10/12 21:12:19 reyk Exp $ */
+/* $OpenBSD: vioblk.c,v 1.3 2012/12/05 23:20:21 deraadt Exp $ */
/*
* Copyright (c) 2012 Stefan Fritsch.
@@ -46,7 +46,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/dev/pci/virtio.c b/sys/dev/pci/virtio.c
index ad25f3e5120..8256a0e3f54 100644
--- a/sys/dev/pci/virtio.c
+++ b/sys/dev/pci/virtio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: virtio.c,v 1.2 2012/10/12 21:12:19 reyk Exp $ */
+/* $OpenBSD: virtio.c,v 1.3 2012/12/05 23:20:21 deraadt Exp $ */
/* $NetBSD: virtio.c,v 1.3 2011/11/02 23:05:52 njoly Exp $ */
/*
@@ -27,8 +27,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/dev/pci/virtio_pci.c b/sys/dev/pci/virtio_pci.c
index 0662b46b9c9..d10e8a01b06 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.3 2012/10/12 21:12:19 reyk Exp $ */
+/* $OpenBSD: virtio_pci.c,v 1.4 2012/12/05 23:20:21 deraadt Exp $ */
/* $NetBSD: virtio.c,v 1.3 2011/11/02 23:05:52 njoly Exp $ */
/*
@@ -27,8 +27,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/dev/sbus/if_le_lebuffer.c b/sys/dev/sbus/if_le_lebuffer.c
index ace45a2d80b..0d5b06a377f 100644
--- a/sys/dev/sbus/if_le_lebuffer.c
+++ b/sys/dev/sbus/if_le_lebuffer.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_le_lebuffer.c,v 1.9 2008/06/26 05:42:18 ray Exp $ */
+/* $OpenBSD: if_le_lebuffer.c,v 1.10 2012/12/05 23:20:21 deraadt Exp $ */
/* $NetBSD: if_le_lebuffer.c,v 1.10 2002/03/11 16:00:56 pk Exp $ */
/*-
@@ -33,7 +33,6 @@
#include "bpfilter.h"
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/mbuf.h>
diff --git a/sys/dev/sbus/lebuffer.c b/sys/dev/sbus/lebuffer.c
index 8581fb91de5..18bf59ef48b 100644
--- a/sys/dev/sbus/lebuffer.c
+++ b/sys/dev/sbus/lebuffer.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lebuffer.c,v 1.9 2008/06/26 05:42:18 ray Exp $ */
+/* $OpenBSD: lebuffer.c,v 1.10 2012/12/05 23:20:21 deraadt Exp $ */
/* $NetBSD: lebuffer.c,v 1.12 2002/03/11 16:00:57 pk Exp $ */
/*-
@@ -30,7 +30,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/dev/usb/if_axe.c b/sys/dev/usb/if_axe.c
index 82f2537effd..a9e3bb6d21e 100644
--- a/sys/dev/usb/if_axe.c
+++ b/sys/dev/usb/if_axe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_axe.c,v 1.114 2012/11/28 01:15:33 brad Exp $ */
+/* $OpenBSD: if_axe.c,v 1.115 2012/12/05 23:20:21 deraadt Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Jonathan Gray <jsg@openbsd.org>
@@ -48,8 +48,6 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
-
/*
* ASIX Electronics AX88172 USB 2.0 ethernet driver. Used in the
* LinkSys USB200M and various other adapters.
diff --git a/sys/dev/usb/if_mos.c b/sys/dev/usb/if_mos.c
index cecf66beca2..0dafb22225b 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.17 2012/10/22 03:23:19 brad Exp $ */
+/* $OpenBSD: if_mos.c,v 1.18 2012/12/05 23:20:21 deraadt Exp $ */
/*
* Copyright (c) 2008 Johann Christian Rode <jcrode@gmx.net>
@@ -64,8 +64,6 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
-
/*
* Moschip MCS7730/MCS7830/MCS7832 USB to Ethernet controller
* The datasheet is available at the following URL:
diff --git a/sys/dev/usb/if_udav.c b/sys/dev/usb/if_udav.c
index 63c0cacb8e0..c32edcd2b6b 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.58 2011/09/04 18:34:02 jsg Exp $ */
+/* $OpenBSD: if_udav.c,v 1.59 2012/12/05 23:20:21 deraadt 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 $ */
/*
@@ -43,8 +43,6 @@
* External PHYs
*/
-#include <sys/cdefs.h>
-
#include "bpfilter.h"
#include <sys/param.h>
diff --git a/sys/dev/usb/if_urndis.c b/sys/dev/usb/if_urndis.c
index 4c9432eaf06..b7fd12db56f 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.34 2012/06/20 10:51:27 fgsch Exp $ */
+/* $OpenBSD: if_urndis.c,v 1.35 2012/12/05 23:20:21 deraadt Exp $ */
/*
* Copyright (c) 2010 Jonathan Armani <armani@openbsd.org>
@@ -19,8 +19,6 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <sys/cdefs.h>
-
#include "bpfilter.h"
#include <sys/param.h>
diff --git a/sys/dev/usb/ubsa.c b/sys/dev/usb/ubsa.c
index 91d38404171..d59eefaff4a 100644
--- a/sys/dev/usb/ubsa.c
+++ b/sys/dev/usb/ubsa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ubsa.c,v 1.53 2011/07/03 15:47:17 matthew Exp $ */
+/* $OpenBSD: ubsa.c,v 1.54 2012/12/05 23:20:21 deraadt Exp $ */
/* $NetBSD: ubsa.c,v 1.5 2002/11/25 00:51:33 fvdl Exp $ */
/*-
* Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>.
@@ -54,8 +54,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/dev/vesa/vesabios.c b/sys/dev/vesa/vesabios.c
index 8e5a974c5d8..1e1fe69203b 100644
--- a/sys/dev/vesa/vesabios.c
+++ b/sys/dev/vesa/vesabios.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vesabios.c,v 1.5 2011/04/05 19:54:35 jasper Exp $ */
+/* $OpenBSD: vesabios.c,v 1.6 2012/12/05 23:20:22 deraadt Exp $ */
/*
* Copyright (c) 2002, 2004
@@ -26,8 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
diff --git a/sys/dev/videomode/edid.c b/sys/dev/videomode/edid.c
index 89f833a5ca9..6b92b5a9cd1 100644
--- a/sys/dev/videomode/edid.c
+++ b/sys/dev/videomode/edid.c
@@ -31,9 +31,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
-/* __KERNEL_RCSID(0, "$NetBSD: edid.c,v 1.5 2007/03/07 19:56:40 macallan Exp $"); */
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
diff --git a/sys/dev/videomode/modelines2c.awk b/sys/dev/videomode/modelines2c.awk
index 74973a2f9d6..424610ceaf6 100644
--- a/sys/dev/videomode/modelines2c.awk
+++ b/sys/dev/videomode/modelines2c.awk
@@ -1,6 +1,6 @@
#! /usr/bin/awk -f
# $NetBSD: modelines2c.awk,v 1.4 2006/10/26 23:19:50 bjh21 Exp $
-# $OpenBSD: modelines2c.awk,v 1.1 2009/10/08 20:35:44 matthieu Exp $
+# $OpenBSD: modelines2c.awk,v 1.2 2012/12/05 23:20:22 deraadt Exp $
#
# Copyright (c) 2006 Itronix Inc.
# All rights reserved.
@@ -49,7 +49,7 @@ NR == 1 {
printf(" *\t%s\n", VERSION);
printf(" */\n\n");
- printf("#include <sys/cdefs.h>\n");
+ printf("#include <sys/types.h>\n");
printf("#include <dev/videomode/videomode.h>\n\n");
diff --git a/sys/dev/videomode/vesagtf.c b/sys/dev/videomode/vesagtf.c
index 4e1f7a8c4ff..d60de2c0e58 100644
--- a/sys/dev/videomode/vesagtf.c
+++ b/sys/dev/videomode/vesagtf.c
@@ -151,8 +151,6 @@
#ifdef _KERNEL
-#include <sys/cdefs.h>
-
#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/videomode/videomode.c b/sys/dev/videomode/videomode.c
index ba5a559a836..2de6364ed77 100644
--- a/sys/dev/videomode/videomode.c
+++ b/sys/dev/videomode/videomode.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: videomode.c,v 1.1 2009/10/08 20:35:44 matthieu Exp $ */
+/* $OpenBSD: videomode.c,v 1.2 2012/12/05 23:20:22 deraadt Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -7,7 +7,6 @@
* NetBSD: modelines,v 1.7 2009/01/21 14:40:25 jnemeth Exp
*/
-#include <sys/cdefs.h>
#include <dev/videomode/videomode.h>
/*
diff --git a/sys/dev/wscons/wsevent.c b/sys/dev/wscons/wsevent.c
index 6766332b7f9..55a167db95a 100644
--- a/sys/dev/wscons/wsevent.c
+++ b/sys/dev/wscons/wsevent.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsevent.c,v 1.7 2007/09/11 13:39:34 gilles Exp $ */
+/* $OpenBSD: wsevent.c,v 1.8 2012/12/05 23:20:22 deraadt Exp $ */
/* $NetBSD: wsevent.c,v 1.16 2003/08/07 16:31:29 agc Exp $ */
/*
@@ -31,8 +31,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
-
/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/dev/wscons/wskbdutil.c b/sys/dev/wscons/wskbdutil.c
index da902602df8..b5377990c61 100644
--- a/sys/dev/wscons/wskbdutil.c
+++ b/sys/dev/wscons/wskbdutil.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wskbdutil.c,v 1.9 2010/08/28 12:48:14 miod Exp $ */
+/* $OpenBSD: wskbdutil.c,v 1.10 2012/12/05 23:20:22 deraadt Exp $ */
/* $NetBSD: wskbdutil.c,v 1.7 1999/12/21 11:59:13 drochner Exp $ */
/*-
@@ -32,7 +32,6 @@
#include <sys/param.h>
#include <sys/types.h>
-#include <sys/cdefs.h>
#include <sys/errno.h>
#include <sys/systm.h>
#include <sys/malloc.h>