diff --git a/[refs] b/[refs]
index e93b2b7196c2..77e92645594a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 523a609496dbc3897e530db2a2f27650d125ea00
+refs/heads/master: d6bc372ea1196066b618908dc522b08cd28993df
diff --git a/trunk/drivers/net/smc91x.c b/trunk/drivers/net/smc91x.c
index 24768c10cadb..53c2dda1dc89 100644
--- a/trunk/drivers/net/smc91x.c
+++ b/trunk/drivers/net/smc91x.c
@@ -1961,7 +1961,8 @@ static int __init smc_probe(struct net_device *dev, void __iomem *ioaddr,
 		if (dev->dma != (unsigned char)-1)
 			printk(" DMA %d", dev->dma);
 
-		printk("%s%s\n", nowait ? " [nowait]" : "",
+		printk("%s%s\n",
+			lp->cfg.flags & SMC91X_NOWAIT ? " [nowait]" : "",
 			THROTTLE_TX_PKTS ? " [throttle_tx]" : "");
 
 		if (!is_valid_ether_addr(dev->dev_addr)) {