diff -rup /home/avatar/ncvs/src/sys/dev/owi/if_owi.c ./if_owi.c
--- /home/avatar/ncvs/src/sys/dev/owi/if_owi.c	Tue Jun 14 11:44:49 2005
+++ ./if_owi.c	Fri Jul 29 11:32:15 2005
@@ -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 -rup /home/avatar/ncvs/src/sys/dev/owi/if_owi_pccard.c ./if_owi_pccard.c
--- /home/avatar/ncvs/src/sys/dev/owi/if_owi_pccard.c	Thu Jun 30 12:06:24 2005
+++ ./if_owi_pccard.c	Fri Jul 29 11:36:30 2005
@@ -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>