diff --git a/[refs] b/[refs]
index dc18ecfef20c..a086900ec403 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 86d289d2570bfa469b756e95bf54cb694d12eeb5
+refs/heads/master: a2521d79715680386f3dbefbc2ffc93fdf08b58a
diff --git a/trunk/drivers/staging/bcm/Bcmchar.c b/trunk/drivers/staging/bcm/Bcmchar.c
index 7250c48ddfde..a8184a5386f7 100644
--- a/trunk/drivers/staging/bcm/Bcmchar.c
+++ b/trunk/drivers/staging/bcm/Bcmchar.c
@@ -248,7 +248,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 	}
 
 	case IOCTL_BCM_REGISTER_WRITE_PRIVATE: {
-		WRM_BUFFER  sWrmBuffer = {0};
+		struct bcm_wrm_buffer sWrmBuffer = {0};
 		UINT uiTempVar = 0;
 		/* Copy Ioctl Buffer structure */
 
@@ -345,8 +345,9 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 	}
 	case IOCTL_BCM_REGISTER_WRITE:
 	case IOCTL_BCM_EEPROM_REGISTER_WRITE: {
-		WRM_BUFFER  sWrmBuffer = {0};
+		struct bcm_wrm_buffer sWrmBuffer = {0};
 		UINT uiTempVar = 0;
+
 		if ((Adapter->IdleMode == TRUE) ||
 			(Adapter->bShutStatus == TRUE) ||
 			(Adapter->bPreparingForLowPowerMode == TRUE)) {
diff --git a/trunk/drivers/staging/bcm/Ioctl.h b/trunk/drivers/staging/bcm/Ioctl.h
index 440bff5df6ad..5910ba509ace 100644
--- a/trunk/drivers/staging/bcm/Ioctl.h
+++ b/trunk/drivers/staging/bcm/Ioctl.h
@@ -6,11 +6,11 @@ typedef struct rdmbuffer {
 	unsigned long Length;
 } __packed RDM_BUFFER, *PRDM_BUFFER;
 
-typedef struct wrmbuffer {
+struct bcm_wrm_buffer {
 	unsigned long Register;
 	unsigned long Length;
 	unsigned char Data[4];
-} __packed WRM_BUFFER, *PWRM_BUFFER;
+} __packed;
 
 struct bcm_ioctl_buffer {
 	void __user *InputBuffer;