From 0b1ae45dc5dd42f0b38bc459bfd1a264a30db152 Mon Sep 17 00:00:00 2001
From: Tai-hwa Liang <avatar@FreeBSD.org>
Date: Mon, 1 Aug 2005 13:51:52 +0000
Subject: [PATCH] Fixing compilation error by:

	- Conforming to the latest ether_ifattach() change;
	- Moving PCCARD_API_LEVEL to the right place.

Reported and Tested by:	Vladimir Grebenschikov <vova at fbsd dot ru>
MFC after:		3 days
---
 sys/dev/owi/if_owi.c        | 2 +-
 sys/dev/owi/if_owi_pccard.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/dev/owi/if_owi.c b/sys/dev/owi/if_owi.c
index 18a1e0988f6e..3cb1c48cbca1 100644
--- a/sys/dev/owi/if_owi.c
+++ b/sys/dev/owi/if_owi.c
@@ -383,7 +383,7 @@ owi_generic_attach(device_t dev)
 	/*
 	 * Call MI attach routine.
 	 */
-	ether_ifattach(ifp, mac.wi_mac_addr);
+	ether_ifattach(ifp, (const u_int8_t *)mac.wi_mac_addr);
 	callout_handle_init(&sc->wi_stat_ch);
 	WI_UNLOCK(sc, s);
 
diff --git a/sys/dev/owi/if_owi_pccard.c b/sys/dev/owi/if_owi_pccard.c
index d1c5bcd173e3..65b49b2e969e 100644
--- a/sys/dev/owi/if_owi_pccard.c
+++ b/sys/dev/owi/if_owi_pccard.c
@@ -59,8 +59,8 @@
 #include <net/if_types.h>
 #include <dev/owi/if_ieee80211.h>
 
-#include <dev/pccard/pccardvar.h>
 #define PCCARD_API_LEVEL 5
+#include <dev/pccard/pccardvar.h>
 #include "pccarddevs.h"
 
 #include <dev/wi/if_wavelan_ieee.h>