diff --git a/[refs] b/[refs] index 8fe8b616e9ff..f6b2fbf10269 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a903d65055199bfad94ae3af598d45970f62f8c2 +refs/heads/master: 38414104db2afdc4d4d0d5d65cbe0e0fdbede30e diff --git a/trunk/drivers/staging/bcm/Macros.h b/trunk/drivers/staging/bcm/Macros.h index 46f5f0feea88..75926433289e 100644 --- a/trunk/drivers/staging/bcm/Macros.h +++ b/trunk/drivers/staging/bcm/Macros.h @@ -331,11 +331,11 @@ typedef enum eNVM_TYPE { NVM_UNKNOWN } NVM_TYPE; -typedef enum ePMU_MODES { +enum bcm_pmu_modes { HYBRID_MODE_7C = 0, INTERNAL_MODE_6 = 1, HYBRID_MODE_6 = 2 -} PMU_MODE; +}; #define MAX_RDM_WRM_RETIRES 1