summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2006-11-26 19:46:29 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2006-11-26 19:46:29 +0000
commit18f674bdb01612760b6d9f4ff6e8c6d471247897 (patch)
tree05ef32f111d0f495ece15b8459ed9cbdabe9643c /sys/dev
parentdd1d2b6c71db5455be522885c8fc13607c33a03d (diff)
avoid extra inclusions; ok jsg
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ic/acx100.c3
-rw-r--r--sys/dev/ic/if_wi.c7
-rw-r--r--sys/dev/ic/if_wi_hostap.c5
-rw-r--r--sys/dev/pci/if_wi_pci.c5
-rw-r--r--sys/dev/pcmcia/if_wi_pcmcia.c5
-rw-r--r--sys/dev/usb/if_wi_usb.c5
6 files changed, 12 insertions, 18 deletions
diff --git a/sys/dev/ic/acx100.c b/sys/dev/ic/acx100.c
index 848db7d5f19..32dad387abc 100644
--- a/sys/dev/ic/acx100.c
+++ b/sys/dev/ic/acx100.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acx100.c,v 1.13 2006/11/26 17:20:33 jsg Exp $ */
+/* $OpenBSD: acx100.c,v 1.14 2006/11/26 19:46:28 deraadt Exp $ */
/*
* Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -69,7 +69,6 @@
#include <netinet/if_ether.h>
#endif
-#include <net80211/ieee80211.h>
#include <net80211/ieee80211_var.h>
#include <net80211/ieee80211_amrr.h>
#include <net80211/ieee80211_radiotap.h>
diff --git a/sys/dev/ic/if_wi.c b/sys/dev/ic/if_wi.c
index 9f69c04ca7d..8de7abf4a19 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.136 2006/11/21 23:00:16 miod Exp $ */
+/* $OpenBSD: if_wi.c,v 1.137 2006/11/26 19:46:28 deraadt Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -87,9 +87,8 @@
#include <netinet/if_ether.h>
#endif
-#include <net80211/ieee80211.h>
-#include <net80211/ieee80211_ioctl.h>
#include <net80211/ieee80211_var.h>
+#include <net80211/ieee80211_ioctl.h>
#if NBPFILTER > 0
#include <net/bpf.h>
@@ -127,7 +126,7 @@ u_int32_t widebug = WIDEBUG;
#if !defined(lint) && !defined(__OpenBSD__)
static const char rcsid[] =
- "$OpenBSD: if_wi.c,v 1.136 2006/11/21 23:00:16 miod Exp $";
+ "$OpenBSD: if_wi.c,v 1.137 2006/11/26 19:46:28 deraadt Exp $";
#endif /* lint */
#ifdef foo
diff --git a/sys/dev/ic/if_wi_hostap.c b/sys/dev/ic/if_wi_hostap.c
index 0a941403608..79aea6b94be 100644
--- a/sys/dev/ic/if_wi_hostap.c
+++ b/sys/dev/ic/if_wi_hostap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_wi_hostap.c,v 1.36 2006/07/01 20:22:22 reyk Exp $ */
+/* $OpenBSD: if_wi_hostap.c,v 1.37 2006/11/26 19:46:28 deraadt Exp $ */
/*
* Copyright (c) 2002
@@ -68,9 +68,8 @@
#include <netinet/ip.h>
#include <netinet/if_ether.h>
-#include <net80211/ieee80211.h>
-#include <net80211/ieee80211_ioctl.h>
#include <net80211/ieee80211_var.h>
+#include <net80211/ieee80211_ioctl.h>
#include <dev/rndvar.h>
diff --git a/sys/dev/pci/if_wi_pci.c b/sys/dev/pci/if_wi_pci.c
index 847fd97fbd2..e383e6b6c03 100644
--- a/sys/dev/pci/if_wi_pci.c
+++ b/sys/dev/pci/if_wi_pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_wi_pci.c,v 1.42 2005/10/31 05:37:13 jsg Exp $ */
+/* $OpenBSD: if_wi_pci.c,v 1.43 2006/11/26 19:46:28 deraadt Exp $ */
/*
* Copyright (c) 2001-2003 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -56,9 +56,8 @@
#include <netinet/if_ether.h>
#endif
-#include <net80211/ieee80211.h>
-#include <net80211/ieee80211_ioctl.h>
#include <net80211/ieee80211_var.h>
+#include <net80211/ieee80211_ioctl.h>
#include <machine/bus.h>
diff --git a/sys/dev/pcmcia/if_wi_pcmcia.c b/sys/dev/pcmcia/if_wi_pcmcia.c
index 112dc6dee20..b06e43267b9 100644
--- a/sys/dev/pcmcia/if_wi_pcmcia.c
+++ b/sys/dev/pcmcia/if_wi_pcmcia.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_wi_pcmcia.c,v 1.65 2006/04/20 20:31:13 miod Exp $ */
+/* $OpenBSD: if_wi_pcmcia.c,v 1.66 2006/11/26 19:46:28 deraadt Exp $ */
/* $NetBSD: if_wi_pcmcia.c,v 1.14 2001/11/26 04:34:56 ichiro Exp $ */
/*
@@ -59,9 +59,8 @@
#include <netinet/if_ether.h>
#endif
-#include <net80211/ieee80211.h>
-#include <net80211/ieee80211_ioctl.h>
#include <net80211/ieee80211_var.h>
+#include <net80211/ieee80211_ioctl.h>
#include <machine/bus.h>
diff --git a/sys/dev/usb/if_wi_usb.c b/sys/dev/usb/if_wi_usb.c
index 73cd2e384eb..dc5fbdbc746 100644
--- a/sys/dev/usb/if_wi_usb.c
+++ b/sys/dev/usb/if_wi_usb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_wi_usb.c,v 1.32 2006/10/24 18:20:46 moritz Exp $ */
+/* $OpenBSD: if_wi_usb.c,v 1.33 2006/11/26 19:46:28 deraadt Exp $ */
/*
* Copyright (c) 2003 Dale Rahn. All rights reserved.
@@ -61,9 +61,8 @@
#define ROUNDUP64(x) (((x)+63) & ~63)
-#include <net80211/ieee80211.h>
-#include <net80211/ieee80211_ioctl.h>
#include <net80211/ieee80211_var.h>
+#include <net80211/ieee80211_ioctl.h>
#if NBPFILTER > 0
#include <net/bpf.h>