From: Chaehyun Lim Date: Thu, 11 Jun 2015 05:35:53 +0000 (+0900) Subject: staging: wilc1000: remove UWORD32 X-Git-Tag: omap-for-v4.2/fixes-rc1^2~92^2~245 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a54d91719a9cef4e599f6c699fb6a5136ed7a3f;p=pandora-kernel.git staging: wilc1000: remove UWORD32 Use u32 instead of UWORD32. Signed-off-by: Chaehyun Lim Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c index 339b2a5c4384..d3a006937619 100644 --- 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); Reading git-diff-tree failed