diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-15 02:12:00 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-15 02:12:00 -0500 |
| commit | 5e30589521518bff36fd2638b3c3d69679c50436 (patch) | |
| tree | 6ac985658a06b0787e4354d0d16d380ea9b16a5a /drivers/net/phy | |
| parent | ac178ef0ae9eb44fd527d87aa9b6394e05f56e1f (diff) | |
| parent | d2f8d7ee1a9b4650b4e43325b321801264f7c37a (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
Diffstat (limited to 'drivers/net/phy')
| -rw-r--r-- | drivers/net/phy/mdio-gpio.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/phy/mdio-gpio.c b/drivers/net/phy/mdio-gpio.c index 3f460c564927..33984b737233 100644 --- a/drivers/net/phy/mdio-gpio.c +++ b/drivers/net/phy/mdio-gpio.c | |||
| @@ -125,6 +125,8 @@ static int __devinit mdio_gpio_bus_init(struct device *dev, | |||
| 125 | if (gpio_request(bitbang->mdio, "mdio")) | 125 | if (gpio_request(bitbang->mdio, "mdio")) |
| 126 | goto out_free_mdc; | 126 | goto out_free_mdc; |
| 127 | 127 | ||
| 128 | gpio_direction_output(bitbang->mdc, 0); | ||
| 129 | |||
| 128 | dev_set_drvdata(dev, new_bus); | 130 | dev_set_drvdata(dev, new_bus); |
| 129 | 131 | ||
| 130 | ret = mdiobus_register(new_bus); | 132 | ret = mdiobus_register(new_bus); |