diff options
author | David S. Miller <davem@davemloft.net> | 2011-03-12 23:41:02 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-03-12 23:41:02 +0100 |
commit | 1561747ddf9d28185548687b11aae7074d6129c4 (patch) | |
tree | 7d0561b6fd8e5f6e6f30e49142213bfb348be5ac /drivers/net/ixgbe/ixgbe_phy.h | |
parent | Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/lin... (diff) | |
parent | ixgbe: DCB, PFC not cleared until reset occurs (diff) | |
download | linux-1561747ddf9d28185548687b11aae7074d6129c4.tar.xz linux-1561747ddf9d28185548687b11aae7074d6129c4.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next-2.6
Diffstat (limited to 'drivers/net/ixgbe/ixgbe_phy.h')
-rw-r--r-- | drivers/net/ixgbe/ixgbe_phy.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ixgbe/ixgbe_phy.h b/drivers/net/ixgbe/ixgbe_phy.h index 9bf2783d7a74..197bdd13106a 100644 --- a/drivers/net/ixgbe/ixgbe_phy.h +++ b/drivers/net/ixgbe/ixgbe_phy.h @@ -108,6 +108,7 @@ s32 ixgbe_get_copper_link_capabilities_generic(struct ixgbe_hw *hw, s32 ixgbe_check_phy_link_tnx(struct ixgbe_hw *hw, ixgbe_link_speed *speed, bool *link_up); +s32 ixgbe_setup_phy_link_tnx(struct ixgbe_hw *hw); s32 ixgbe_get_phy_firmware_version_tnx(struct ixgbe_hw *hw, u16 *firmware_version); s32 ixgbe_get_phy_firmware_version_generic(struct ixgbe_hw *hw, |