diff options
| author | David S. Miller <davem@davemloft.net> | 2011-11-17 03:31:56 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-11-17 03:31:56 +0400 |
| commit | f85fa279138489543206381883c8f67ef94aa912 (patch) | |
| tree | d54d632556885732e94cf18c7cf8d3bef2c740b5 /drivers/net/ethernet/intel/e1000 | |
| parent | 358b838291f618278080bbed435b755f9b46748e (diff) | |
| parent | ea99d832cce7e724ba37c488e0571a00cb14d430 (diff) | |
| download | linux-f85fa279138489543206381883c8f67ef94aa912.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next
Diffstat (limited to 'drivers/net/ethernet/intel/e1000')
| -rw-r--r-- | drivers/net/ethernet/intel/e1000/e1000_hw.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/e1000/e1000_hw.h b/drivers/net/ethernet/intel/e1000/e1000_hw.h index 5c9a8403668b..cf7e3c094477 100644 --- a/drivers/net/ethernet/intel/e1000/e1000_hw.h +++ b/drivers/net/ethernet/intel/e1000/e1000_hw.h @@ -448,7 +448,6 @@ void e1000_io_write(struct e1000_hw *hw, unsigned long port, u32 value); #define E1000_DEV_ID_INTEL_CE4100_GBE 0x2E6E #define NODE_ADDRESS_SIZE 6 -#define ETH_LENGTH_OF_ADDRESS 6 /* MAC decode size is 128K - This is the size of BAR0 */ #define MAC_DECODE_SIZE (128 * 1024) |