diff --git a/[refs] b/[refs]
index da328a136333..cb21ee452000 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 021cbd755e2c63bba840ecfd9ae55dafbe6838fb
+refs/heads/master: 306a7acd2a5038aa9e0e75d03b000aaadbf2218d
diff --git a/trunk/drivers/staging/bcm/InterfaceMisc.c b/trunk/drivers/staging/bcm/InterfaceMisc.c
index 793a492e64b3..fd482a29ead8 100644
--- a/trunk/drivers/staging/bcm/InterfaceMisc.c
+++ b/trunk/drivers/staging/bcm/InterfaceMisc.c
@@ -6,7 +6,7 @@ int InterfaceRDM(PS_INTERFACE_ADAPTER psIntfAdapter,
 		int len)
 {
 	int bytes;
-	USHORT usRetries = 0;
+	unsigned short usRetries = 0;
 
 	if (psIntfAdapter == NULL) {
 		BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_PRINTK, 0, 0, "Interface Adapter is NULL");
@@ -63,7 +63,7 @@ int InterfaceWRM(PS_INTERFACE_ADAPTER psIntfAdapter,
 		int len)
 {
 	int retval = 0;
-	USHORT usRetries = 0;
+	unsigned short usRetries = 0;
 
 	if (psIntfAdapter == NULL) {
 		BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_PRINTK, 0, 0, "Interface Adapter  is NULL");