From ac0559c278c0564ce477e4a4e42b8418208699a7 Mon Sep 17 00:00:00 2001 From: Daniel Cotey Date: Sat, 15 Sep 2012 06:04:06 -0700 Subject: [PATCH] --- yaml --- r: 325333 b: refs/heads/master c: 9088c8a99337d00dd1d52684b5ce85347940c432 h: refs/heads/master i: 325331: 38a73fb19f519348d3695fdb9a6dc1ed8ce2fab9 v: v3 --- [refs] | 2 +- trunk/drivers/staging/silicom/bp_mod.h | 30 +++++++++++++------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/[refs] b/[refs] index 49e846109d15..7421f3997d96 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 22f3504684b3fc4e452db60f54419f109fdb4260 +refs/heads/master: 9088c8a99337d00dd1d52684b5ce85347940c432 diff --git a/trunk/drivers/staging/silicom/bp_mod.h b/trunk/drivers/staging/silicom/bp_mod.h index a11b8093f18a..7b01f48acd56 100644 --- a/trunk/drivers/staging/silicom/bp_mod.h +++ b/trunk/drivers/staging/silicom/bp_mod.h @@ -402,21 +402,21 @@ static inline unsigned int jiffies_to_msecs(const unsigned long j) (pid == SILICOM_PEG4BPFI6FCZX_SSID)) #define PEG5_IF_SERIES(pid) \ -((pid==SILICOM_PEG4BPI6_SSID)|| \ -(pid==SILICOM_PEG2BPI6_SSID)|| \ -(pid==SILICOM_PEG4BPI6FC_SSID)|| \ -(pid==SILICOM_PEG6BPI6_SSID)|| \ -(pid==SILICOM_PEG2BPI6SC6_SSID)|| \ -(pid==SILICOM_MEG2BPI6_SSID)|| \ -(pid==SILICOM_XEG2BPI6_SSID)|| \ -(pid==SILICOM_MEG4BPI6_SSID)|| \ -(pid==SILICOM_M1EG2BPI6_SSID)|| \ -(pid==SILICOM_M1EG4BPI6_SSID)|| \ -(pid==SILICOM_M1EG6BPI6_SSID)|| \ -(pid==SILICOM_PEG6BPI_SSID)|| \ -(pid==SILICOM_PEG4BPIL_SSID)|| \ -(pid==SILICOM_PEG2BISC6_SSID)|| \ -(pid==SILICOM_PEG2BPI5_SSID)) + ((pid == SILICOM_PEG4BPI6_SSID) || \ + (pid == SILICOM_PEG2BPI6_SSID) || \ + (pid == SILICOM_PEG4BPI6FC_SSID) || \ + (pid == SILICOM_PEG6BPI6_SSID) || \ + (pid == SILICOM_PEG2BPI6SC6_SSID) || \ + (pid == SILICOM_MEG2BPI6_SSID) || \ + (pid == SILICOM_XEG2BPI6_SSID) || \ + (pid == SILICOM_MEG4BPI6_SSID) || \ + (pid == SILICOM_M1EG2BPI6_SSID) || \ + (pid == SILICOM_M1EG4BPI6_SSID) || \ + (pid == SILICOM_M1EG6BPI6_SSID) || \ + (pid == SILICOM_PEG6BPI_SSID) || \ + (pid == SILICOM_PEG4BPIL_SSID) || \ + (pid == SILICOM_PEG2BISC6_SSID) || \ + (pid == SILICOM_PEG2BPI5_SSID)) #define PEG80_IF_SERIES(pid) \ ((pid==SILICOM_M1E2G4BPi80_SSID)|| \