diff options
| author | Steve French <sfrench@us.ibm.com> | 2009-02-03 10:19:23 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2009-02-03 10:19:23 -0500 |
| commit | e1f81c8a417be466e85a38b61679aa6860ec7331 (patch) | |
| tree | 749815f74bfad330e83560a10fd5da5fc4d8c765 /drivers/net/gianfar_mii.c | |
| parent | 0e2bedaa394f74fa9f75ee937488c33d90039b5a (diff) | |
| parent | b1792e367053968f2ddb48bc911d314143ce6242 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/gianfar_mii.c')
| -rw-r--r-- | drivers/net/gianfar_mii.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/gianfar_mii.c b/drivers/net/gianfar_mii.c index f3706e415b45..f49a426ad681 100644 --- a/drivers/net/gianfar_mii.c +++ b/drivers/net/gianfar_mii.c | |||
| @@ -234,6 +234,8 @@ static int gfar_mdio_probe(struct of_device *ofdev, | |||
| 234 | if (NULL == new_bus) | 234 | if (NULL == new_bus) |
| 235 | return -ENOMEM; | 235 | return -ENOMEM; |
| 236 | 236 | ||
| 237 | device_init_wakeup(&ofdev->dev, 1); | ||
| 238 | |||
| 237 | new_bus->name = "Gianfar MII Bus", | 239 | new_bus->name = "Gianfar MII Bus", |
| 238 | new_bus->read = &gfar_mdio_read, | 240 | new_bus->read = &gfar_mdio_read, |
| 239 | new_bus->write = &gfar_mdio_write, | 241 | new_bus->write = &gfar_mdio_write, |