Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 111807
b: refs/heads/master
c: d6bc372
h: refs/heads/master
i:
  111805: 41d5f2d
  111803: e378a8e
  111799: f6ea963
  111791: 3e563a4
  111775: d1e9b4e
  111743: 3a40b7e
v: v3
  • Loading branch information
Magnus Damm authored and Jeff Garzik committed Sep 24, 2008
1 parent 57bf32d commit f97b867
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 523a609496dbc3897e530db2a2f27650d125ea00
refs/heads/master: d6bc372ea1196066b618908dc522b08cd28993df
3 changes: 2 additions & 1 deletion trunk/drivers/net/smc91x.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down

0 comments on commit f97b867

Please sign in to comment.