diff --git a/[refs] b/[refs] index 696092f2393c..3b35341c5e7f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1ce4784e675150748ff2d19b9a4ba287e3018905 +refs/heads/master: 40bee8c1f1e78f8fefe69bb320cd991c88a497bb diff --git a/trunk/drivers/staging/brcm80211/include/bcmsdpcm.h b/trunk/drivers/staging/brcm80211/include/bcmsdpcm.h index 48699471fac8..5175e67a6d28 100644 --- a/trunk/drivers/staging/brcm80211/include/bcmsdpcm.h +++ b/trunk/drivers/staging/brcm80211/include/bcmsdpcm.h @@ -186,7 +186,7 @@ typedef volatile struct { * Shared structure between dongle and the host. * The structure contains pointers to trap or assert information. */ -#define SDPCM_SHARED_VERSION 0x0001 +#define SDPCM_SHARED_VERSION 0x0002 #define SDPCM_SHARED_VERSION_MASK 0x00FF #define SDPCM_SHARED_ASSERT_BUILT 0x0100 #define SDPCM_SHARED_ASSERT 0x0200 @@ -200,6 +200,7 @@ typedef struct { u32 assert_line; u32 console_addr; /* Address of hndrte_cons_t */ u32 msgtrace_addr; + u8 tag[32]; } sdpcm_shared_t; extern sdpcm_shared_t sdpcm_shared;