From f97b8674007501374ea5099910afaaeb8be4cbec Mon Sep 17 00:00:00 2001
From: Magnus Damm <damm@igel.co.jp>
Date: Mon, 8 Sep 2008 14:02:56 +0900
Subject: [PATCH] --- yaml --- r: 111807 b: refs/heads/master c:
 d6bc372ea1196066b618908dc522b08cd28993df h: refs/heads/master i:   111805:
 41d5f2dd66701e71deb693aa64959e25ae78423e   111803:
 e378a8e0a6af3ff67242b6dfc839d7fe38a535e4   111799:
 f6ea96328655d8d1c1f783847f0ffafb8c6079ca   111791:
 3e563a465e3fd44c9d36f1fbceef0695e2d7552c   111775:
 d1e9b4e6089a7d39f6a3dcca49f07d2ee90c0cf0   111743:
 3a40b7ed3c9ade73394ad5aeb5d73abc9a31821a v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/net/smc91x.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

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)) {