diff --git a/[refs] b/[refs]
index 7e9d05dcc244..0532131e6225 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf3760dad576c8dfb4fef4b8a8a08a027bf02583
+refs/heads/master: 347c8d83cd9f546a8357e1ab12fa6867707975d8
diff --git a/trunk/drivers/net/smc911x.c b/trunk/drivers/net/smc911x.c
index 5051554ff05b..1f26ab0e7986 100644
--- a/trunk/drivers/net/smc911x.c
+++ b/trunk/drivers/net/smc911x.c
@@ -2050,7 +2050,9 @@ static int __init smc911x_probe(struct net_device *dev)
  */
 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);
 		}
 	}