diff --git a/[refs] b/[refs] index a8191aac9bb4..d325c679f951 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 490deb7927667e384dfb75e0e41bb1f895429eef +refs/heads/master: 7cdaac387c8b0d23521b18edc86933247301051b diff --git a/trunk/drivers/staging/silicom/bp_mod.h b/trunk/drivers/staging/silicom/bp_mod.h index 96c7780868af..c15d9d06ca4a 100644 --- a/trunk/drivers/staging/silicom/bp_mod.h +++ b/trunk/drivers/staging/silicom/bp_mod.h @@ -282,14 +282,14 @@ static inline unsigned int jiffies_to_msecs(const unsigned long j) (pid == INTEL_PEG4BPFII_SSID)) #define NOKIA_SERIES(pid) \ - ((pid==NOKIA_PMCXG2BPIN_SSID)|| \ - (pid==NOKIA_PMCXG4BPIN_SSID)|| \ - (pid==SILICOM_PMCX4BPI_SSID)|| \ - (pid==NOKIA_PMCXG2BPFIN_SSID)|| \ - (pid==SILICOM_PMCXG2BPFI_SSID)|| \ - (pid==NOKIA_PMCXG2BPIN2_SSID)|| \ - (pid==NOKIA_PMCXG4BPIN2_SSID)|| \ - (pid==SILICOM_PMCX2BPI_SSID)) + ((pid == NOKIA_PMCXG2BPIN_SSID) || \ + (pid == NOKIA_PMCXG4BPIN_SSID) || \ + (pid == SILICOM_PMCX4BPI_SSID) || \ + (pid == NOKIA_PMCXG2BPFIN_SSID) || \ + (pid == SILICOM_PMCXG2BPFI_SSID) || \ + (pid == NOKIA_PMCXG2BPIN2_SSID) || \ + (pid == NOKIA_PMCXG4BPIN2_SSID) || \ + (pid == SILICOM_PMCX2BPI_SSID)) #define DISCF_IF_SERIES(pid) \ (pid==SILICOM_PEG2TBFI_SSID)