diff options
author | Magnus Damm <damm@igel.co.jp> | 2008-09-08 01:02:56 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-09-24 18:48:55 -0400 |
commit | d6bc372ea1196066b618908dc522b08cd28993df (patch) | |
tree | 54680c998cc36fe96f0da17dbe138884d406cfc2 /drivers/net/smc91x.c | |
parent | 523a609496dbc3897e530db2a2f27650d125ea00 (diff) |
smc91x: fix nowait printout
Commit c4f0e76747e80578a8f7fddd82fd0ce8127bd2f8 added nowait platform
data support. The printout code was however not updated, so the value
of SMC_NOWAIT is still used. This patch makes sure that nowait is printed
accordingly to platform data.
Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/smc91x.c')
-rw-r--r-- | drivers/net/smc91x.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c index 24768c10cadb..53c2dda1dc89 100644 --- a/drivers/net/smc91x.c +++ b/drivers/net/smc91x.c | |||
@@ -1961,7 +1961,8 @@ static int __init smc_probe(struct net_device *dev, void __iomem *ioaddr, | |||
1961 | if (dev->dma != (unsigned char)-1) | 1961 | if (dev->dma != (unsigned char)-1) |
1962 | printk(" DMA %d", dev->dma); | 1962 | printk(" DMA %d", dev->dma); |
1963 | 1963 | ||
1964 | printk("%s%s\n", nowait ? " [nowait]" : "", | 1964 | printk("%s%s\n", |
1965 | lp->cfg.flags & SMC91X_NOWAIT ? " [nowait]" : "", | ||
1965 | THROTTLE_TX_PKTS ? " [throttle_tx]" : ""); | 1966 | THROTTLE_TX_PKTS ? " [throttle_tx]" : ""); |
1966 | 1967 | ||
1967 | if (!is_valid_ether_addr(dev->dev_addr)) { | 1968 | if (!is_valid_ether_addr(dev->dev_addr)) { |