diff options
Diffstat (limited to 'drivers/net/e1000/e1000_hw.h')
-rw-r--r-- | drivers/net/e1000/e1000_hw.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/e1000/e1000_hw.h b/drivers/net/e1000/e1000_hw.h index 243dad25bccc..1a8a0006f3e3 100644 --- a/drivers/net/e1000/e1000_hw.h +++ b/drivers/net/e1000/e1000_hw.h | |||
@@ -284,7 +284,6 @@ typedef enum { | |||
284 | #define E1000_ERR_MASTER_REQUESTS_PENDING 10 | 284 | #define E1000_ERR_MASTER_REQUESTS_PENDING 10 |
285 | #define E1000_ERR_HOST_INTERFACE_COMMAND 11 | 285 | #define E1000_ERR_HOST_INTERFACE_COMMAND 11 |
286 | #define E1000_BLK_PHY_RESET 12 | 286 | #define E1000_BLK_PHY_RESET 12 |
287 | #define E1000_ERR_SWFW_SYNC 13 | ||
288 | 287 | ||
289 | #define E1000_BYTE_SWAP_WORD(_value) ((((_value) & 0x00ff) << 8) | \ | 288 | #define E1000_BYTE_SWAP_WORD(_value) ((((_value) & 0x00ff) << 8) | \ |
290 | (((_value) & 0xff00) >> 8)) | 289 | (((_value) & 0xff00) >> 8)) |
@@ -1327,7 +1326,6 @@ struct e1000_hw { | |||
1327 | e1000_ffe_config ffe_config_state; | 1326 | e1000_ffe_config ffe_config_state; |
1328 | u32 asf_firmware_present; | 1327 | u32 asf_firmware_present; |
1329 | u32 eeprom_semaphore_present; | 1328 | u32 eeprom_semaphore_present; |
1330 | u32 swfw_sync_present; | ||
1331 | unsigned long io_base; | 1329 | unsigned long io_base; |
1332 | u32 phy_id; | 1330 | u32 phy_id; |
1333 | u32 phy_revision; | 1331 | u32 phy_revision; |