diff --git a/[refs] b/[refs]
index c46aa882bc54..dc18ecfef20c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bac02ed8a74f09848f81ffa2d53c36a6256ebbf9
+refs/heads/master: 86d289d2570bfa469b756e95bf54cb694d12eeb5
diff --git a/trunk/drivers/staging/bcm/Bcmchar.c b/trunk/drivers/staging/bcm/Bcmchar.c
index cb0c0c9a16a4..7250c48ddfde 100644
--- a/trunk/drivers/staging/bcm/Bcmchar.c
+++ b/trunk/drivers/staging/bcm/Bcmchar.c
@@ -401,8 +401,8 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 		UINT value = 0;
 		UINT uiBit = 0;
 		UINT uiOperation = 0;
+		struct bcm_gpio_info gpio_info = {0};
 
-		GPIO_INFO   gpio_info = {0};
 		if ((Adapter->IdleMode == TRUE) ||
 			(Adapter->bShutStatus == TRUE) ||
 			(Adapter->bPreparingForLowPowerMode == TRUE)) {
@@ -518,7 +518,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 	case IOCTL_BCM_GPIO_STATUS_REQUEST: {
 		ULONG uiBit = 0;
 		UCHAR ucRead[4];
-		GPIO_INFO   gpio_info = {0};
+		struct bcm_gpio_info gpio_info = {0};
 
 		if ((Adapter->IdleMode == TRUE) ||
 			(Adapter->bShutStatus == TRUE) ||
diff --git a/trunk/drivers/staging/bcm/Ioctl.h b/trunk/drivers/staging/bcm/Ioctl.h
index ddaf789dc273..440bff5df6ad 100644
--- a/trunk/drivers/staging/bcm/Ioctl.h
+++ b/trunk/drivers/staging/bcm/Ioctl.h
@@ -19,10 +19,10 @@ struct bcm_ioctl_buffer {
 	unsigned long OutputLength;
 } __packed;
 
-typedef struct stGPIOInfo {
+struct bcm_gpio_info {
 	unsigned int uiGpioNumber; /* valid numbers 0-15 */
 	unsigned int uiGpioValue; /* 1 set ; 0 not  set */
-} __packed GPIO_INFO, *PGPIO_INFO;
+} __packed;
 
 struct bcm_user_thread_req {
 	/* 0->Inactivate LED thread. */