diff options
| author |   David S. Miller <davem@davemloft.net> | 2011-03-01 12:24:04 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-01 12:24:04 -0800 |
| commit | 9836f4080fd5b680cc2d9656355c1a7c681b1ffd (patch) | |
| tree | e65c4386dbeb125891b06b01be107323e176ac7f /drivers/net/sfc/txc43128_phy.c | |
| parent | bonding: use the correct size for _simple_hash() (diff) | |
| parent | sfc: Bump version to 3.1 (diff) | |
| download | linux-dev-9836f4080fd5b680cc2d9656355c1a7c681b1ffd.tar.xz linux-dev-9836f4080fd5b680cc2d9656355c1a7c681b1ffd.zip | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next-2.6
Diffstat (limited to 'drivers/net/sfc/txc43128_phy.c')
| -rw-r--r-- | drivers/net/sfc/txc43128_phy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/sfc/txc43128_phy.c b/drivers/net/sfc/txc43128_phy.c index 351794a79215..d9886addcc99 100644 --- a/drivers/net/sfc/txc43128_phy.c +++ b/drivers/net/sfc/txc43128_phy.c @@ -1,6 +1,6 @@ /**************************************************************************** * Driver for Solarflare Solarstorm network controllers and boards - * Copyright 2006-2010 Solarflare Communications Inc. + * Copyright 2006-2011 Solarflare Communications Inc. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published @@ -193,7 +193,7 @@ static int txc_reset_phy(struct efx_nic *efx) goto fail; /* Check that all the MMDs we expect are present and responding. */ - rc = efx_mdio_check_mmds(efx, TXC_REQUIRED_DEVS, 0); + rc = efx_mdio_check_mmds(efx, TXC_REQUIRED_DEVS); if (rc < 0) goto fail; |