diff --git a/[refs] b/[refs]
index 8d9723b63710..7e2b0008c6d0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 495abc7995ffff39ba4333ad8e382017dc2192f8
+refs/heads/master: 89c625bef65fd245692bc884ae8268f6d5b60da9
diff --git a/trunk/drivers/staging/ath6kl/htc2/AR6000/ar6k.h b/trunk/drivers/staging/ath6kl/htc2/AR6000/ar6k.h
index ebcc82b1362b..e8b638c5ddfc 100644
--- a/trunk/drivers/staging/ath6kl/htc2/AR6000/ar6k.h
+++ b/trunk/drivers/staging/ath6kl/htc2/AR6000/ar6k.h
@@ -65,9 +65,9 @@ typedef PREPACK struct _AR6K_IRQ_ENABLE_REGISTERS {
     u8 counter_int_status_enable;
 } POSTPACK AR6K_IRQ_ENABLE_REGISTERS;
 
-typedef PREPACK struct _AR6K_GMBOX_CTRL_REGISTERS {
+PREPACK struct ar6k_gmbox_ctrl_registers {
     u8 int_status_enable;
-} POSTPACK AR6K_GMBOX_CTRL_REGISTERS;
+} POSTPACK;
 
 #include "athendpack.h"
 
@@ -139,7 +139,7 @@ struct ar6k_device {
     int                             MaxSendBundleSize;
     AR6K_GMBOX_INFO                 GMboxInfo;
     bool                          GMboxEnabled;
-    AR6K_GMBOX_CTRL_REGISTERS       GMboxControlRegisters;
+    struct ar6k_gmbox_ctrl_registers       GMboxControlRegisters;
     int                             RecheckIRQStatusCnt;
 };