Staging: w35und: kill WBDEBUG and remove common.h header file

[karo-tx-linux.git] / drivers / staging / winbond / wbhal.c

diff --git a/drivers/staging/winbond/wbhal.c b/drivers/staging/winbond/wbhal.c
index 8a9d21cbb0c0778b091417be9c22f0d297ca60a4..c8313dba7dc5d93238e2e4dfb2373629da92ce65 100644 (file)
--- a/drivers/staging/winbond/wbhal.c
+++ b/drivers/staging/winbond/wbhal.c
@@ -1,4 +1,4 @@
-#include "os_common.h"
+#include "sysdef.h"
 #include "wbhal_f.h"
 #include "wblinux_f.h"
 
@@ -8,7 +8,7 @@ void hal_set_ethernet_address( phw_data_t pHwData, u8 *current_address )
 
        if( pHwData->SurpriseRemove ) return;
 
-       memcpy( pHwData->CurrentMacAddress, current_address, ETH_LENGTH_OF_ADDRESS );
+       memcpy( pHwData->CurrentMacAddress, current_address, ETH_ALEN );
 
        ltmp[0]= cpu_to_le32( *(u32 *)pHwData->CurrentMacAddress );
        ltmp[1]= cpu_to_le32( *(u32 *)(pHwData->CurrentMacAddress + 4) ) & 0xffff;
@@ -396,7 +396,7 @@ static void hal_set_current_channel_ex(  phw_data_t pHwData,  ChanInfo channel )
        pHwData->Channel = channel.ChanNo;
        pHwData->band = channel.band;
        #ifdef _PE_STATE_DUMP_
-       WBDEBUG(("Set channel is %d, band =%d\n", pHwData->Channel, pHwData->band));
+       printk("Set channel is %d, band =%d\n", pHwData->Channel, pHwData->band);
        #endif
        reg->M28_MacControl &= ~0xff; // Clean channel information field
        reg->M28_MacControl |= channel.ChanNo;