Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 325326
b: refs/heads/master
c: 490deb7
h: refs/heads/master
v: v3
  • Loading branch information
Daniel Cotey authored and Greg Kroah-Hartman committed Sep 17, 2012
1 parent 7ad022b commit 94e1095
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 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: 40fe4f89671fb3c7ded94190fb267402a38b0261
refs/heads/master: 490deb7927667e384dfb75e0e41bb1f895429eef
6 changes: 3 additions & 3 deletions trunk/drivers/staging/silicom/bp_mod.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)|| \
Expand Down

0 comments on commit 94e1095

Please sign in to comment.