diff --git a/[refs] b/[refs] index aba6c26d4670..d5ac4b827fdf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2ea2ea4dab8512560aec31a9e4b6d11b6d0e3b15 +refs/heads/master: 0118f42af24864b9451e347bc17941fd4c21cd83 diff --git a/trunk/drivers/staging/silicom/bp_mod.h b/trunk/drivers/staging/silicom/bp_mod.h index 425085a70b52..bc5ef43aed96 100644 --- a/trunk/drivers/staging/silicom/bp_mod.h +++ b/trunk/drivers/staging/silicom/bp_mod.h @@ -366,13 +366,13 @@ static inline unsigned int jiffies_to_msecs(const unsigned long j) #define SILICOM_PE210G2BPI9T_SSID 0x120 #define DBI_IF_SERIES(pid) \ -((pid==SILICOM_PE10GDBISR_SSID)|| \ - (pid==SILICOM_PE10GDBILR_SSID)|| \ - (pid==SILICOM_XE10G2BPILR_SSID)|| \ - (pid==SILICOM_PE210G2DBi9LR_SSID)) + ((pid == SILICOM_PE10GDBISR_SSID) || \ + (pid == SILICOM_PE10GDBILR_SSID) || \ + (pid == SILICOM_XE10G2BPILR_SSID) || \ + (pid == SILICOM_PE210G2DBi9LR_SSID)) #define PEGF5_IF_SERIES(pid) \ -((pid==SILICOM_PEG2BPFI5_SSID)|| \ + ((pid == SILICOM_PEG2BPFI5_SSID) || \ (pid==SILICOM_PEG2BPFI5LX_SSID)|| \ (pid==SILICOM_PEG4BPFI6_SSID)|| \ (pid==SILICOM_PEG4BPFI6LX_SSID)|| \