diff -NurpP --minimal linux-3.6.10-vs2.3.4.4/drivers/staging/csr/csr_wifi_hip_xbv.c linux-3.6.10-vs2.3.4.5/drivers/staging/csr/csr_wifi_hip_xbv.c
--- linux-3.6.10-vs2.3.4.4/drivers/staging/csr/csr_wifi_hip_xbv.c	2012-10-04 15:27:30.000000000 +0200
+++ linux-3.6.10-vs2.3.4.5/drivers/staging/csr/csr_wifi_hip_xbv.c	2012-12-10 17:33:14.000000000 +0100
@@ -55,7 +55,7 @@ typedef struct
 {
     char t_name[4];
     u32     t_len;
-} tag_t;
+} ctag_t;
 
 
 #define TAG_EQ(i, v)    (((i)[0] == (v)[0]) &&  \
@@ -90,7 +90,7 @@ typedef struct
     u32 ptr;
 } xbv_stack_t;
 
-static s32 read_tag(card_t *card, ct_t *ct, tag_t *tag);
+static s32 read_tag(card_t *card, ct_t *ct, ctag_t *tag);
 static s32 read_bytes(card_t *card, ct_t *ct, void *buf, u32 len);
 static s32 read_uint(card_t *card, ct_t *ct, u32 *u, u32 len);
 static s32 xbv_check(xbv1_t *fwinfo, const xbv_stack_t *stack,
@@ -160,7 +160,7 @@ static u32 write_fwdl_to_ptdl(void *buf,
 CsrResult xbv1_parse(card_t *card, fwreadfn_t readfn, void *dlpriv, xbv1_t *fwinfo)
 {
     ct_t ct;
-    tag_t tag;
+    ctag_t tag;
     xbv_stack_t stack;
 
     ct.dlpriv = dlpriv;
@@ -505,7 +505,7 @@ static u32 xbv2uint(u8 *ptr, s32 len)
 }
 
 
-static s32 read_tag(card_t *card, ct_t *ct, tag_t *tag)
+static s32 read_tag(card_t *card, ct_t *ct, ctag_t *tag)
 {
     u8 buf[8];
     s32 n;