diff --git a/[refs] b/[refs] index c02d885fb6a4..a8191aac9bb4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 40fe4f89671fb3c7ded94190fb267402a38b0261 +refs/heads/master: 490deb7927667e384dfb75e0e41bb1f895429eef diff --git a/trunk/drivers/staging/silicom/bp_mod.h b/trunk/drivers/staging/silicom/bp_mod.h index 81cd97b65b92..96c7780868af 100644 --- a/trunk/drivers/staging/silicom/bp_mod.h +++ b/trunk/drivers/staging/silicom/bp_mod.h @@ -277,9 +277,9 @@ static inline unsigned int jiffies_to_msecs(const unsigned long j) (pid == SILICOM_XE10G2BPILR_SSID)) #define INTEL_IF_SERIES(pid) \ - ((pid==INTEL_PEG4BPII_SSID)|| \ - (pid==INTEL_PEG4BPIIO_SSID)|| \ - (pid==INTEL_PEG4BPFII_SSID)) + ((pid == INTEL_PEG4BPII_SSID) || \ + (pid == INTEL_PEG4BPIIO_SSID) || \ + (pid == INTEL_PEG4BPFII_SSID)) #define NOKIA_SERIES(pid) \ ((pid==NOKIA_PMCXG2BPIN_SSID)|| \