Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 325327
b: refs/heads/master
c: 7cdaac3
h: refs/heads/master
i:
  325325: 7ad022b
  325323: 48042ea
  325319: d91fe47
  325311: 5b46843
v: v3
  • Loading branch information
Daniel Cotey authored and Greg Kroah-Hartman committed Sep 17, 2012
1 parent 94e1095 commit a3ea571
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 490deb7927667e384dfb75e0e41bb1f895429eef
refs/heads/master: 7cdaac387c8b0d23521b18edc86933247301051b
16 changes: 8 additions & 8 deletions trunk/drivers/staging/silicom/bp_mod.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit a3ea571

Please sign in to comment.