Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 204043
b: refs/heads/master
c: 96f2bd1
h: refs/heads/master
i:
  204041: 90b1df7
  204039: cb5eb22
v: v3
  • Loading branch information
Bruce Allan authored and David S. Miller committed Aug 3, 2010
1 parent bef684d commit fdb1b91
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: 5c7bf2f4d6304ab4741f38365ca0c0223147263d
refs/heads/master: 96f2bd13bfb6df5beec7fe55405ad94b528b8b4c
2 changes: 1 addition & 1 deletion trunk/drivers/net/e1000e/hw.h
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ enum e1e_registers {
#define E1000_KMRNCTRLSTA_DIAG_NELPBK 0x1000 /* Nearend Loopback mode */
#define E1000_KMRNCTRLSTA_K1_CONFIG 0x7
#define E1000_KMRNCTRLSTA_K1_ENABLE 0x0002
#define E1000_KMRNCTRLSTA_HD_CTRL 0x0002
#define E1000_KMRNCTRLSTA_HD_CTRL 0x10 /* Kumeran HD Control */

#define IFE_PHY_EXTENDED_STATUS_CONTROL 0x10
#define IFE_PHY_SPECIAL_CONTROL 0x11 /* 100BaseTx PHY Special Control */
Expand Down

0 comments on commit fdb1b91

Please sign in to comment.