1 files changed, 6 insertions, 5 deletions

diff --git a/drivers/net/e1000e/hw.h b/drivers/net/e1000e/hw.h
index ba302a5c2c30..6c2fa8327f5c 100644
--- a/drivers/net/e1000e/hw.h
+++ b/drivers/net/e1000e/hw.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2010 Intel Corporation.
+  Copyright(c) 1999 - 2011 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -83,6 +83,7 @@ enum e1e_registers {
         E1000_EXTCNF_CTRL  = 0x00F00, /* Extended Configuration Control */
         E1000_EXTCNF_SIZE  = 0x00F08, /* Extended Configuration Size */
         E1000_PHY_CTRL     = 0x00F10, /* PHY Control Register in CSR */
+#define E1000_POEMB     E1000_PHY_CTRL  /* PHY OEM Bits */
         E1000_PBA      = 0x01000, /* Packet Buffer Allocation - RW */
         E1000_PBS      = 0x01008, /* Packet Buffer Size */
         E1000_EEMNGCTL = 0x01010, /* MNG EEprom Control */
@@ -101,7 +102,7 @@ enum e1e_registers {
         E1000_RDTR     = 0x02820, /* Rx Delay Timer - RW */
         E1000_RXDCTL_BASE = 0x02828, /* Rx Descriptor Control - RW */
 #define E1000_RXDCTL(_n)   (E1000_RXDCTL_BASE + (_n << 8))
-        E1000_RADV     = 0x0282C, /* RX Interrupt Absolute Delay Timer - RW */
+        E1000_RADV     = 0x0282C, /* Rx Interrupt Absolute Delay Timer - RW */
 
 /* Convenience macros
  *
@@ -755,6 +756,7 @@ struct e1000_host_mng_command_info {
 /* Function pointers and static data for the MAC. */
 struct e1000_mac_operations {
         s32  (*id_led_init)(struct e1000_hw *);
+        s32  (*blink_led)(struct e1000_hw *);
         bool (*check_mng_mode)(struct e1000_hw *);
         s32  (*check_for_link)(struct e1000_hw *);
         s32  (*cleanup_led)(struct e1000_hw *);
@@ -811,9 +813,8 @@ struct e1000_nvm_operations {
 
 struct e1000_mac_info {
         struct e1000_mac_operations ops;
-
-        u8 addr[6];
-        u8 perm_addr[6];
+        u8 addr[ETH_ALEN];
+        u8 perm_addr[ETH_ALEN];
 
         enum e1000_mac_type type;