diff --git a/[refs] b/[refs] index beca3338f199..78a8809cff41 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: af72c617944784575126899eb603c9fc711341dc +refs/heads/master: c081e78bd41786dc7144757bfa4a7e477cb4da38 diff --git a/trunk/drivers/staging/bcm/Macros.h b/trunk/drivers/staging/bcm/Macros.h index 015e094d89ea..224a15650053 100644 --- a/trunk/drivers/staging/bcm/Macros.h +++ b/trunk/drivers/staging/bcm/Macros.h @@ -182,13 +182,12 @@ enum enLinkStatus { COMPLETE_WAKE_UP_NOTIFICATION_FRM_FW = 9 }; -typedef enum _E_PHS_DSC_ACTION { +enum bcm_phs_dsc_action { eAddPHSRule = 0, eSetPHSRule, eDeletePHSRule, eDeleteAllPHSRules -} E_PHS_DSC_ACTION; - +}; #define CM_CONTROL_NEWDSX_MULTICLASSIFIER_REQ 0x89 /* Host to Mac */ #define CM_CONTROL_NEWDSX_MULTICLASSIFIER_RESP 0xA9 /* Mac to Host */