diff options
author | Paul Mackerras <paulus@samba.org> | 2008-11-19 16:10:32 +1100 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-11-19 16:10:32 +1100 |
commit | cea555d384b85271035814c5adad23e6c7fc5d2a (patch) | |
tree | 1181b6333a69a135293ec75f8a48c849ee32c015 /drivers/net/smc911x.c | |
parent | 78608dd32ce46789e970d6c3c423cd668c138d6c (diff) | |
parent | 7f0f598a0069d1ab072375965a4b69137233169c (diff) |
Merge branch 'linux-2.6' into next
Diffstat (limited to 'drivers/net/smc911x.c')
-rw-r--r-- | drivers/net/smc911x.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c index 5051554ff05..1f26ab0e798 100644 --- a/drivers/net/smc911x.c +++ b/drivers/net/smc911x.c @@ -2050,7 +2050,9 @@ err_out: */ static int smc911x_drv_probe(struct platform_device *pdev) { +#ifdef SMC_DYNAMIC_BUS_CONFIG struct smc911x_platdata *pd = pdev->dev.platform_data; +#endif struct net_device *ndev; struct resource *res; struct smc911x_local *lp; @@ -2182,9 +2184,9 @@ static int smc911x_drv_resume(struct platform_device *dev) if (netif_running(ndev)) { smc911x_reset(ndev); - smc911x_enable(ndev); if (lp->phy_type != 0) smc911x_phy_configure(&lp->phy_configure); + smc911x_enable(ndev); netif_device_attach(ndev); } } |