diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-12 14:41:02 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-12 14:41:02 -0800 |
| commit | 1561747ddf9d28185548687b11aae7074d6129c4 (patch) | |
| tree | 7d0561b6fd8e5f6e6f30e49142213bfb348be5ac /drivers/net/igb/e1000_hw.h | |
| parent | ab1ebc953081d4e50f8e6d2d8d89b2cde3184e78 (diff) | |
| parent | 1f4a0244ff002672be855ff2eaa4a29a63d42d42 (diff) | |
| download | kernel_samsung_smdk4412-1561747ddf9d28185548687b11aae7074d6129c4.zip kernel_samsung_smdk4412-1561747ddf9d28185548687b11aae7074d6129c4.tar.gz kernel_samsung_smdk4412-1561747ddf9d28185548687b11aae7074d6129c4.tar.bz2 | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next-2.6
Diffstat (limited to 'drivers/net/igb/e1000_hw.h')
| -rw-r--r-- | drivers/net/igb/e1000_hw.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/igb/e1000_hw.h b/drivers/net/igb/e1000_hw.h index eec9ed7..27153e8 100644 --- a/drivers/net/igb/e1000_hw.h +++ b/drivers/net/igb/e1000_hw.h @@ -336,6 +336,8 @@ struct e1000_nvm_operations { s32 (*read)(struct e1000_hw *, u16, u16, u16 *); void (*release)(struct e1000_hw *); s32 (*write)(struct e1000_hw *, u16, u16, u16 *); + s32 (*update)(struct e1000_hw *); + s32 (*validate)(struct e1000_hw *); }; struct e1000_info { @@ -422,7 +424,6 @@ struct e1000_phy_info { struct e1000_nvm_info { struct e1000_nvm_operations ops; - enum e1000_nvm_type type; enum e1000_nvm_override override; @@ -488,6 +489,7 @@ struct e1000_mbx_info { struct e1000_dev_spec_82575 { bool sgmii_active; bool global_device_reset; + bool eee_disable; }; struct e1000_hw { |