summaryrefslogtreecommitdiff
path: root/sys/dev/pcmcia
diff options
context:
space:
mode:
authorFederico G. Schwindt <fgsch@cvs.openbsd.org>2004-11-23 21:12:24 +0000
committerFederico G. Schwindt <fgsch@cvs.openbsd.org>2004-11-23 21:12:24 +0000
commit2ddb009591c7614d76bc64f22494724fb3c019ea (patch)
treec09d08114a36c5d73cc2f318ae1612760bd5b1fe /sys/dev/pcmcia
parentedacaa72f3c49ccb24c573b5c9b5fa09571d1151 (diff)
replace old net/if_ieee80211.h header with the net80211 ones, kernel part.
millert@ mcbride@ jsg@
Diffstat (limited to 'sys/dev/pcmcia')
-rw-r--r--sys/dev/pcmcia/if_awi_pcmcia.c4
-rw-r--r--sys/dev/pcmcia/if_ray.c5
-rw-r--r--sys/dev/pcmcia/if_wi_pcmcia.c5
3 files changed, 8 insertions, 6 deletions
diff --git a/sys/dev/pcmcia/if_awi_pcmcia.c b/sys/dev/pcmcia/if_awi_pcmcia.c
index c9fe377af7b..890bbdced37 100644
--- a/sys/dev/pcmcia/if_awi_pcmcia.c
+++ b/sys/dev/pcmcia/if_awi_pcmcia.c
@@ -1,5 +1,5 @@
/* $NetBSD: if_awi_pcmcia.c,v 1.13 2000/03/22 11:22:20 onoe Exp $ */
-/* $OpenBSD: if_awi_pcmcia.c,v 1.12 2003/10/22 09:58:46 jmc Exp $ */
+/* $OpenBSD: if_awi_pcmcia.c,v 1.13 2004/11/23 21:12:23 fgsch Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
#include <netinet/in.h>
#include <netinet/if_ether.h>
-#include <net/if_ieee80211.h>
+#include <net80211/ieee80211.h>
#if NBPFILTER > 0
#include <net/bpf.h>
diff --git a/sys/dev/pcmcia/if_ray.c b/sys/dev/pcmcia/if_ray.c
index 4a91f5c7a36..8850f1538c8 100644
--- a/sys/dev/pcmcia/if_ray.c
+++ b/sys/dev/pcmcia/if_ray.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ray.c,v 1.24 2004/06/05 20:23:00 mcbride Exp $ */
+/* $OpenBSD: if_ray.c,v 1.25 2004/11/23 21:12:23 fgsch Exp $ */
/* $NetBSD: if_ray.c,v 1.21 2000/07/05 02:35:54 onoe Exp $ */
/*
@@ -87,7 +87,8 @@
#include <netinet/if_ether.h>
#endif
-#include <net/if_ieee80211.h> /* here, since ETHER_ADDR_LEN is in netinet */
+#include <net80211/ieee80211.h>
+#include <net80211/ieee80211_ioctl.h>
#if NBPFILTER > 0
#include <net/bpf.h>
diff --git a/sys/dev/pcmcia/if_wi_pcmcia.c b/sys/dev/pcmcia/if_wi_pcmcia.c
index 4f77dd20df5..c9a2c5e9b86 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.55 2004/10/22 08:48:38 jsg Exp $ */
+/* $OpenBSD: if_wi_pcmcia.c,v 1.56 2004/11/23 21:12:23 fgsch Exp $ */
/* $NetBSD: if_wi_pcmcia.c,v 1.14 2001/11/26 04:34:56 ichiro Exp $ */
/*
@@ -58,7 +58,8 @@
#include <netinet/if_ether.h>
#endif
-#include <net/if_ieee80211.h>
+#include <net80211/ieee80211.h>
+#include <net80211/ieee80211_ioctl.h>
#include <machine/bus.h>