Remove excessive sys/cdefs.h inclusion

ok guenther millert kettenis

9 files changed, 10 insertions, 27 deletions

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>