diff options
| author | David S. Miller <davem@davemloft.net> | 2010-08-03 01:22:46 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-08-03 01:22:46 -0400 |
| commit | 00dad5e479531e379aba7358600cc768725d4f1f (patch) | |
| tree | 652199eacee32c2cf317f5a54da8265973d29978 /drivers/net/e1000e/hw.h | |
| parent | c477d0447db08068a497e7beb892b2b2a7bff64b (diff) | |
| parent | 3a3dfb062c2e086c202d34f09ce29634515ad256 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/e1000e/hw.h
net/bridge/br_device.c
net/bridge/br_input.c
Diffstat (limited to 'drivers/net/e1000e/hw.h')
| -rw-r--r-- | drivers/net/e1000e/hw.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/e1000e/hw.h b/drivers/net/e1000e/hw.h index 0cd569a57f6d..a419b0715985 100644 --- a/drivers/net/e1000e/hw.h +++ b/drivers/net/e1000e/hw.h | |||
| @@ -312,7 +312,7 @@ enum e1e_registers { | |||
| 312 | #define E1000_KMRNCTRLSTA_INBAND_PARAM 0x9 /* Kumeran InBand Parameters */ | 312 | #define E1000_KMRNCTRLSTA_INBAND_PARAM 0x9 /* Kumeran InBand Parameters */ |
| 313 | #define E1000_KMRNCTRLSTA_DIAG_NELPBK 0x1000 /* Nearend Loopback mode */ | 313 | #define E1000_KMRNCTRLSTA_DIAG_NELPBK 0x1000 /* Nearend Loopback mode */ |
| 314 | #define E1000_KMRNCTRLSTA_K1_CONFIG 0x7 | 314 | #define E1000_KMRNCTRLSTA_K1_CONFIG 0x7 |
| 315 | #define E1000_KMRNCTRLSTA_K1_ENABLE 0x140E | 315 | #define E1000_KMRNCTRLSTA_K1_ENABLE 0x0002 |
| 316 | #define E1000_KMRNCTRLSTA_HD_CTRL 0x0002 | 316 | #define E1000_KMRNCTRLSTA_HD_CTRL 0x0002 |
| 317 | 317 | ||
| 318 | #define IFE_PHY_EXTENDED_STATUS_CONTROL 0x10 | 318 | #define IFE_PHY_EXTENDED_STATUS_CONTROL 0x10 |