From a3ea5716a47332ad798a25c243b8757a40056954 Mon Sep 17 00:00:00 2001 From: Daniel Cotey Date: Sat, 15 Sep 2012 06:00:41 -0700 Subject: [PATCH] --- yaml --- r: 325327 b: refs/heads/master c: 7cdaac387c8b0d23521b18edc86933247301051b h: refs/heads/master i: 325325: 7ad022b347f32e866e85346ee1fa82c19c17183f 325323: 48042ea507ebdbaba81f5a828a50b914ad1ae0bc 325319: d91fe470134f5a3d522f621d5ef6ec0b9a94a08e 325311: 5b468432b42548025fdc7dc898fdad6ac9ccc5ec v: v3 --- [refs] | 2 +- trunk/drivers/staging/silicom/bp_mod.h | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) 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)