diff --git a/[refs] b/[refs]
index 7b4e1a9c3bb0..f393dd62a41c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3efa535669a63d10f9b1c5f17ee6014224cc2d26
+refs/heads/master: 72ccb86354f909bebac7722aa378d4409684a4d3
diff --git a/trunk/drivers/staging/bcm/PHSDefines.h b/trunk/drivers/staging/bcm/PHSDefines.h
index 52033c47037d..e72212eb33cd 100644
--- a/trunk/drivers/staging/bcm/PHSDefines.h
+++ b/trunk/drivers/staging/bcm/PHSDefines.h
@@ -60,27 +60,27 @@ typedef enum _E_CLASSIFIER_ENTRY_CONTEXT {
 
 typedef struct _S_CLASSIFIER_ENTRY {
 	u8  bUsed;
-	B_UINT16 uiClassifierRuleId;
+	u16 uiClassifierRuleId;
 	u8  u8PHSI;
 	S_PHS_RULE *pstPhsRule;
 	u8  bUnclassifiedPHSRule;
 } S_CLASSIFIER_ENTRY;
 
 typedef struct _S_CLASSIFIER_TABLE {
-	B_UINT16 uiTotalClassifiers;
+	u16 uiTotalClassifiers;
 	S_CLASSIFIER_ENTRY stActivePhsRulesList[MAX_PHSRULE_PER_SF];
 	S_CLASSIFIER_ENTRY stOldPhsRulesList[MAX_PHSRULE_PER_SF];
-	B_UINT16 uiOldestPhsRuleIndex;
+	u16 uiOldestPhsRuleIndex;
 } S_CLASSIFIER_TABLE;
 
 typedef struct _S_SERVICEFLOW_ENTRY {
 	u8  bUsed;
-	B_UINT16 uiVcid;
+	u16 uiVcid;
 	S_CLASSIFIER_TABLE  *pstClassifierTable;
 } S_SERVICEFLOW_ENTRY;
 
 typedef struct _S_SERVICEFLOW_TABLE {
-	B_UINT16 uiTotalServiceFlows;
+	u16 uiTotalServiceFlows;
 	S_SERVICEFLOW_ENTRY stSFList[MAX_SERVICEFLOWS];
 } S_SERVICEFLOW_TABLE;