diff --git a/[refs] b/[refs]
index 7e2b0008c6d0..d0deb52868b5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 89c625bef65fd245692bc884ae8268f6d5b60da9
+refs/heads/master: 69c44f42f6467441cc413ccbabbb9deeb82d16c4
diff --git a/trunk/drivers/staging/ath6kl/htc2/AR6000/ar6k.h b/trunk/drivers/staging/ath6kl/htc2/AR6000/ar6k.h
index e8b638c5ddfc..0bee46af9009 100644
--- a/trunk/drivers/staging/ath6kl/htc2/AR6000/ar6k.h
+++ b/trunk/drivers/staging/ath6kl/htc2/AR6000/ar6k.h
@@ -96,14 +96,14 @@ struct ar6k_async_reg_io_buffer {
     u8 _Pad2[A_CACHE_LINE_PAD];
 };
 
-typedef struct _AR6K_GMBOX_INFO { 
+struct ar6k_gmbox_info { 
     void        *pProtocolContext;
     int    (*pMessagePendingCallBack)(void *pContext, u8 LookAheadBytes[], int ValidBytes);
     int    (*pCreditsPendingCallback)(void *pContext, int NumCredits,  bool CreditIRQEnabled);
     void        (*pTargetFailureCallback)(void *pContext, int Status);
     void        (*pStateDumpCallback)(void *pContext);
     bool      CreditCountIRQEnabled;
-} AR6K_GMBOX_INFO; 
+}; 
 
 struct ar6k_device {
     A_MUTEX_T                   Lock;
@@ -137,7 +137,7 @@ struct ar6k_device {
     bool                          ScatterIsVirtual;
     int                             MaxRecvBundleSize;
     int                             MaxSendBundleSize;
-    AR6K_GMBOX_INFO                 GMboxInfo;
+    struct ar6k_gmbox_info                 GMboxInfo;
     bool                          GMboxEnabled;
     struct ar6k_gmbox_ctrl_registers       GMboxControlRegisters;
     int                             RecheckIRQStatusCnt;