diff options
| author | Jens Axboe | 2009-12-03 13:49:39 +0100 |
|---|---|---|
| committer | Jens Axboe | 2009-12-03 13:49:39 +0100 |
| commit | 220d0b1dbf78c6417a658c96e571415552d3abac (patch) | |
| tree | 70cd3862540c38ea490e7a27c3c7acc35b680234 /drivers/net/phy/mdio-gpio.c | |
| parent | cfq-iosched: no dispatch limit for single queue (diff) | |
| parent | Linux 2.6.32 (diff) | |
| download | kernel-qcow2-linux-220d0b1dbf78c6417a658c96e571415552d3abac.tar.gz kernel-qcow2-linux-220d0b1dbf78c6417a658c96e571415552d3abac.tar.xz kernel-qcow2-linux-220d0b1dbf78c6417a658c96e571415552d3abac.zip | |
Merge branch 'master' into for-2.6.33
Diffstat (limited to 'drivers/net/phy/mdio-gpio.c')
| -rw-r--r-- | drivers/net/phy/mdio-gpio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/mdio-gpio.c b/drivers/net/phy/mdio-gpio.c index 8659d341e769..35897134a5dd 100644 --- a/drivers/net/phy/mdio-gpio.c +++ b/drivers/net/phy/mdio-gpio.c @@ -139,7 +139,7 @@ out: return NULL; } -static void __devinit mdio_gpio_bus_deinit(struct device *dev) +static void mdio_gpio_bus_deinit(struct device *dev) { struct mii_bus *bus = dev_get_drvdata(dev); struct mdio_gpio_info *bitbang = bus->priv; |