From 4412f60b74f6e8b924dd5872995ff1fcd80f1b9a Mon Sep 17 00:00:00 2001
From: Kevin McKinney <klmckinney1@gmail.com>
Date: Thu, 22 Nov 2012 14:48:51 -0500
Subject: [PATCH] --- yaml --- r: 338176 b: refs/heads/master c:
 d532703c384c0df449c343ca3604f3650dad53b6 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/staging/bcm/Bcmchar.c | 2 +-
 trunk/drivers/staging/bcm/Ioctl.h   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 4b3df08c5ec6..373bba692a8c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff4e065de10f877af48e997c1ba5f1197ff90f4c
+refs/heads/master: d532703c384c0df449c343ca3604f3650dad53b6
diff --git a/trunk/drivers/staging/bcm/Bcmchar.c b/trunk/drivers/staging/bcm/Bcmchar.c
index 45c066a4a40e..c1b63822a264 100644
--- a/trunk/drivers/staging/bcm/Bcmchar.c
+++ b/trunk/drivers/staging/bcm/Bcmchar.c
@@ -478,7 +478,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 	break;
 
 	case BCM_LED_THREAD_STATE_CHANGE_REQ: {
-		USER_THREAD_REQ threadReq = {0};
+		struct bcm_user_thread_req threadReq = {0};
 		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "User made LED thread InActive");
 
 		if ((Adapter->IdleMode == TRUE) ||
diff --git a/trunk/drivers/staging/bcm/Ioctl.h b/trunk/drivers/staging/bcm/Ioctl.h
index d25771275701..561588ea477e 100644
--- a/trunk/drivers/staging/bcm/Ioctl.h
+++ b/trunk/drivers/staging/bcm/Ioctl.h
@@ -24,11 +24,11 @@ typedef struct stGPIOInfo {
 	unsigned int uiGpioValue; /* 1 set ; 0 not  set */
 } __packed GPIO_INFO, *PGPIO_INFO;
 
-typedef struct stUserThreadReq {
+struct bcm_user_thread_req {
 	/* 0->Inactivate LED thread. */
 	/* 1->Activate the LED thread */
 	unsigned int ThreadState;
-} __packed USER_THREAD_REQ, *PUSER_THREAD_REQ;
+} __packed;
 
 #define LED_THREAD_ACTIVATION_REQ  1
 #define BCM_IOCTL				'k'