staging: wilc1000: remove UWORD32

Use u32 instead of UWORD32.

Signed-off-by: Chaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c
index 339b2a5..d3a0069 100644 (file)
--- a/drivers/staging/wilc1000/coreconfigurator.c
+++ b/drivers/staging/wilc1000/coreconfigurator.c
@@ -499,10 +499,10 @@ INLINE WILC_Uint32 get_beacon_timestamp_lo(u8 *data)
        return time_stamp;
 }
 
-INLINE UWORD32 get_beacon_timestamp_hi(u8 *data)
+INLINE u32 get_beacon_timestamp_hi(u8 *data)
 {
-       UWORD32 time_stamp = 0;
-       UWORD32 index    = (MAC_HDR_LEN + 4);
+       u32 time_stamp = 0;
+       u32 index    = (MAC_HDR_LEN + 4);
 
        time_stamp |= data[index++];
        time_stamp |= (data[index++] << 8);

diff --cc drivers/staging/wilc1000/itypes.h
Simple merge