Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 325067
b: refs/heads/master
c: 6690da5
h: refs/heads/master
i:
  325065: 8b93b2f
  325063: 3faf5e9
v: v3
  • Loading branch information
DanielC authored and Greg Kroah-Hartman committed Sep 10, 2012
1 parent 1dce88b commit eea1809
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 3 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: 909ff71041262f1e9de465dd8c0fee6da17747fd
refs/heads/master: 6690da5fdc2056b78376919944886c78defcba5f
2 changes: 1 addition & 1 deletion trunk/drivers/staging/silicom/bp_ioctl.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
#define WDT_STEP_TIME 0x10 /* BIT_4 */

#define WD_MIN_TIME_GET(desc) (desc & 0xf)
#define WD_STEP_COUNT_GET(desc) (desc>>5) & 0xf
#define WD_STEP_COUNT_GET(desc) ((desc>>5) & 0xf)

typedef enum {
IF_SCAN,
Expand Down
1 change: 0 additions & 1 deletion trunk/drivers/staging/silicom/libbp_sd.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
#define NIC_CAP_NEG 0x4000000 /* BIT 26 */

#define WD_MIN_TIME_GET(desc) (desc & 0xf)
#define WD_STEP_COUNT_GET(desc) (desc>>5) & 0xf
#define WDT_STEP_TIME 0x10

struct bp_info {
Expand Down

0 comments on commit eea1809

Please sign in to comment.