Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 325338
b: refs/heads/master
c: b2774ed
h: refs/heads/master
v: v3
  • Loading branch information
Daniel Cotey authored and Greg Kroah-Hartman committed Sep 17, 2012
1 parent 10af71f commit 30fa19c
Show file tree
Hide file tree
Showing 2 changed files with 3 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: 30f62902e3911616fab109e3380a1c9d74e18f33
refs/heads/master: b2774ed427afeac28687a61e4aab63ece5f7c201
4 changes: 2 additions & 2 deletions trunk/drivers/staging/silicom/bypass.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#define CMND_EN_MASK 0x02 /* BIT_1 */
#define DIS_BYPASS_CAP_MASK 0x04 /* BIT_2 Bypass Cap is disable*/
#define DFLT_PWRON_MASK 0x08 /* BIT_3 */
#define BYPASS_OFF_MASK 0x10 /* BIT_4 */
#define BYPASS_OFF_MASK 0x10 /* BIT_4 */
#define BYPASS_FLAG_MASK 0x20 /* BIT_5 */
#define STD_NIC_MASK (DIS_BYPASS_CAP_MASK | BYPASS_OFF_MASK | DFLT_PWRON_MASK)
#define WD_EXP_FLAG_MASK 0x40 /* BIT_6 */
Expand Down Expand Up @@ -65,7 +65,7 @@

#define STATUS_DISC_REG_ADDR 13
#define WDTE_DISC_BPN_MASK 0x01 /* BIT_0 1 when wdt expired -> TAP, 0 - Bypass */
#define STD_NIC_ON_MASK 0x02 /* BIT_1 */
#define STD_NIC_ON_MASK 0x02 /* BIT_1 */
#define DIS_DISC_CAP_MASK 0x04 /* BIT_2 TAP Cap is disable*/
#define DFLT_PWRON_DISC_MASK 0x08 /* BIT_3 */
#define DISC_OFF_MASK 0x10 /* BIT_4 */
Expand Down

0 comments on commit 30fa19c

Please sign in to comment.