diff --git a/[refs] b/[refs] index f11035e820db..12ebffecf96f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 79a469136cbd6bc7a91f8e3b785aa793e39a2a75 +refs/heads/master: b2a089b7732df4750617c82d390ace61a60ddb0d diff --git a/trunk/drivers/staging/bcm/Debug.h b/trunk/drivers/staging/bcm/Debug.h index 4b620d9ba08b..663325bc5ad7 100644 --- a/trunk/drivers/staging/bcm/Debug.h +++ b/trunk/drivers/staging/bcm/Debug.h @@ -179,14 +179,14 @@ typedef struct { /* ---Kernel-space mapping of Debug State */ typedef struct _S_BCM_DEBUG_STATE { - UINT type; + unsigned int type; /* A bitmap of 32 bits for Subtype per Type. * Valid indexes in 'subtype' array are *only* 1,2,4 and 8, * corresponding to valid Type values. Hence we use the 'Type' field * as the index value, ignoring the array entries 0,3,5,6,7 ! */ - UINT subtype[(NUMTYPES*2)+1]; - UINT debug_level; + unsigned int subtype[(NUMTYPES*2)+1]; + unsigned int debug_level; } S_BCM_DEBUG_STATE; /* Instantiated in the Adapter structure * We'll reuse the debug level parameter to include a bit (the MSB) to indicate whether or not