Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 189131
b: refs/heads/master
c: 05ad62a
h: refs/heads/master
i:
  189129: 3564980
  189127: d13d999
v: v3
  • Loading branch information
Nick Bowler authored and Linus Torvalds committed Mar 29, 2010
1 parent daacf6e commit 006fdec
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 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: b72c40949b0f04728f2993a1434598d3bad094ea
refs/heads/master: 05ad62a5ee2ec2f65142aa2bf5c8a7e2f9cf9590
2 changes: 1 addition & 1 deletion trunk/drivers/staging/et131x/et1310_mac.c
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ void ConfigMACRegs2(struct et131x_adapter *etdev)
}

/* Enable TXMAC */
ctl |= 0x05; /* TX mac enable, FC disable */
ctl |= 0x09; /* TX mac enable, FC disable */
writel(ctl, &etdev->regs->txmac.ctl);

/* Ready to start the RXDMA/TXDMA engine */
Expand Down

0 comments on commit 006fdec

Please sign in to comment.