Merge branch 'for-linus' of git://codeaurora.org/quic/kernel/davidb/linux-msm

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / staging / brcm80211 / brcmfmac / dhd_custom_gpio.c

diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c b/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c
index c3f18bb3b27c70f1204bc3a2af79e70dd210253a..cbfa1c1b7059c9198e8ecea76410303f35ccc0f2 100644 (file)
--- a/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c
@@ -15,7 +15,6 @@
  */
 
 #include <linux/netdevice.h>
-#include <osl.h>
 #include <bcmutils.h>
 
 #include <dngl_stats.h>
@@ -149,9 +148,8 @@ int dhd_custom_get_mac_address(unsigned char *buf)
 #ifdef EXAMPLE_GET_MAC
        /* EXAMPLE code */
        {
-               struct ether_addr ea_example = {
-                       {0x00, 0x11, 0x22, 0x33, 0x44, 0xFF} };
-               bcopy((char *)&ea_example, buf, sizeof(struct ether_addr));
+               u8 ea_example[ETH_ALEN] = {0x00, 0x11, 0x22, 0x33, 0x44, 0xFF};
+               memcpy(buf, ea_example, ETH_ALEN);
        }
 #endif                         /* EXAMPLE_GET_MAC */