diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-08 02:35:54 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-08 02:35:54 -0700 |
| commit | 33f9936b2b73dba6c8685994c441c4fd30b04814 (patch) | |
| tree | 9ce8105bc1e44ba66276695927b15df0d3fc185d /drivers/net/ucc_geth_ethtool.c | |
| parent | aca51397d01474f80cab8fc978559b45f2e453ad (diff) | |
| parent | f227ec3ca2b7be449fb2156e82b40cceed87a34a (diff) | |
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/ucc_geth_ethtool.c')
| -rw-r--r-- | drivers/net/ucc_geth_ethtool.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/ucc_geth_ethtool.c b/drivers/net/ucc_geth_ethtool.c index 9a9622c13e2b..299b7f176950 100644 --- a/drivers/net/ucc_geth_ethtool.c +++ b/drivers/net/ucc_geth_ethtool.c @@ -108,12 +108,6 @@ static char rx_fw_stat_gstrings[][ETH_GSTRING_LEN] = { #define UEC_TX_FW_STATS_LEN ARRAY_SIZE(tx_fw_stat_gstrings) #define UEC_RX_FW_STATS_LEN ARRAY_SIZE(rx_fw_stat_gstrings) -extern int init_flow_control_params(u32 automatic_flow_control_mode, - int rx_flow_control_enable, - int tx_flow_control_enable, u16 pause_period, - u16 extension_field, volatile u32 *upsmr_register, - volatile u32 *uempr_register, volatile u32 *maccfg1_register); - static int uec_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd) { |