diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-17 14:13:13 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-17 14:13:13 -0700 |
| commit | 2e5a3eaca386ce026f240c7b21e5c4958fcea946 (patch) | |
| tree | 191cf2b340d008b711137ce8c40b27a3dadff8d5 /drivers/net/e1000e/e1000.h | |
| parent | 8c95b4773dd8d0415269ffad7301ef96d75be8ee (diff) | |
| parent | 36b30ea940bb88d88c90698e0e3d97a805ab5856 (diff) | |
| download | op-kernel-dev-2e5a3eaca386ce026f240c7b21e5c4958fcea946.zip op-kernel-dev-2e5a3eaca386ce026f240c7b21e5c4958fcea946.tar.gz | |
Merge branch 'upstream-net26' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/e1000e/e1000.h')
| -rw-r--r-- | drivers/net/e1000e/e1000.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h index b941a6b..5a89dff 100644 --- a/drivers/net/e1000e/e1000.h +++ b/drivers/net/e1000e/e1000.h @@ -271,7 +271,7 @@ struct e1000_info { enum e1000_mac_type mac; unsigned int flags; u32 pba; - s32 (*get_invariants)(struct e1000_adapter *); + s32 (*get_variants)(struct e1000_adapter *); struct e1000_mac_operations *mac_ops; struct e1000_phy_operations *phy_ops; struct e1000_nvm_operations *nvm_ops; @@ -357,7 +357,7 @@ extern struct e1000_info e1000_ich8_info; extern struct e1000_info e1000_ich9_info; extern struct e1000_info e1000_es2_info; -extern s32 e1000e_read_part_num(struct e1000_hw *hw, u32 *part_num); +extern s32 e1000e_read_pba_num(struct e1000_hw *hw, u32 *pba_num); extern s32 e1000e_commit_phy(struct e1000_hw *hw); |
