diff options
| author | Maxime Ripard <maxime.ripard@free-electrons.com> | 2013-04-08 23:39:22 +0400 |
|---|---|---|
| committer | Maxime Ripard <maxime.ripard@free-electrons.com> | 2013-04-08 23:39:22 +0400 |
| commit | 7c91d302ffe2ffac813c47d6ba2e7489a2ccb35f (patch) | |
| tree | 78a2cf601e986694765b28079bf749a8eaa6a2b9 /drivers/net/ethernet/intel/e1000e/regs.h | |
| parent | 0b824f8dad9fdfc7c1bf9c1d3ac744075eb73ec6 (diff) | |
| parent | 918d7f6f68620e0721bb31402ebf87e15f826831 (diff) | |
| download | linux-7c91d302ffe2ffac813c47d6ba2e7489a2ccb35f.tar.xz | |
Merge remote-tracking branch 'clk/clk-for-3.10' into sunxi/core-for-3.10
Diffstat (limited to 'drivers/net/ethernet/intel/e1000e/regs.h')
| -rw-r--r-- | drivers/net/ethernet/intel/e1000e/regs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/regs.h b/drivers/net/ethernet/intel/e1000e/regs.h index 794fe1497666..a7e6a3e37257 100644 --- a/drivers/net/ethernet/intel/e1000e/regs.h +++ b/drivers/net/ethernet/intel/e1000e/regs.h @@ -42,6 +42,7 @@ #define E1000_FEXTNVM 0x00028 /* Future Extended NVM - RW */ #define E1000_FEXTNVM3 0x0003C /* Future Extended NVM 3 - RW */ #define E1000_FEXTNVM4 0x00024 /* Future Extended NVM 4 - RW */ +#define E1000_FEXTNVM6 0x00010 /* Future Extended NVM 6 - RW */ #define E1000_FEXTNVM7 0x000E4 /* Future Extended NVM 7 - RW */ #define E1000_FCT 0x00030 /* Flow Control Type - RW */ #define E1000_VET 0x00038 /* VLAN Ether Type - RW */ |