diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-10-14 17:57:29 +0200 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-10-14 17:57:29 +0200 |
| commit | ce0ecc8abfa9904e27a5f3ac4dd83398b134278d (patch) | |
| tree | 031363a799c1869889c961fcc49715896f59f703 /drivers/net/e1000e/hw.h | |
| parent | tile: replace some BUG_ON checks with BUILD_BUG_ON checks (diff) | |
| parent | Linux 2.6.36-rc7 (diff) | |
| download | linux-ce0ecc8abfa9904e27a5f3ac4dd83398b134278d.tar.xz linux-ce0ecc8abfa9904e27a5f3ac4dd83398b134278d.zip | |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/net/e1000e/hw.h')
| -rw-r--r-- | drivers/net/e1000e/hw.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/e1000e/hw.h b/drivers/net/e1000e/hw.h index 66ed08f726fb..ba302a5c2c30 100644 --- a/drivers/net/e1000e/hw.h +++ b/drivers/net/e1000e/hw.h @@ -57,6 +57,7 @@ enum e1e_registers { E1000_SCTL = 0x00024, /* SerDes Control - RW */ E1000_FCAL = 0x00028, /* Flow Control Address Low - RW */ E1000_FCAH = 0x0002C, /* Flow Control Address High -RW */ + E1000_FEXTNVM4 = 0x00024, /* Future Extended NVM 4 - RW */ E1000_FEXTNVM = 0x00028, /* Future Extended NVM - RW */ E1000_FCT = 0x00030, /* Flow Control Type - RW */ E1000_VET = 0x00038, /* VLAN Ether Type - RW */ |