From c694ddf519fc9074c674c57a3bf071f55417126d Mon Sep 17 00:00:00 2001 From: Brice Goglin Date: Mon, 3 Jul 2006 18:41:30 -0400 Subject: [PATCH] --- yaml --- r: 32108 b: refs/heads/master c: d6020787488e837d3c2b24eb1b8cf9849058d340 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/myri10ge/myri10ge.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index d748aa8e6fa2..e9fa64f1ba6d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 18ac544306855aa366d34d29755f4596acd7a58d +refs/heads/master: d6020787488e837d3c2b24eb1b8cf9849058d340 diff --git a/trunk/drivers/net/myri10ge/myri10ge.c b/trunk/drivers/net/myri10ge/myri10ge.c index 8345e4f25793..abb5dd57c73f 100644 --- a/trunk/drivers/net/myri10ge/myri10ge.c +++ b/trunk/drivers/net/myri10ge/myri10ge.c @@ -2734,11 +2734,10 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent) dev_err(&pdev->dev, "register_netdev failed: %d\n", status); goto abort_with_irq; } - - printk(KERN_INFO "myri10ge: %s: %s IRQ %d, tx bndry %d, fw %s, WC %s\n", - netdev->name, (mgp->msi_enabled ? "MSI" : "xPIC"), - pdev->irq, mgp->tx.boundary, mgp->fw_name, - (mgp->mtrr >= 0 ? "Enabled" : "Disabled")); + dev_info(dev, "%s IRQ %d, tx bndry %d, fw %s, WC %s\n", + (mgp->msi_enabled ? "MSI" : "xPIC"), + pdev->irq, mgp->tx.boundary, mgp->fw_name, + (mgp->mtrr >= 0 ? "Enabled" : "Disabled")); return 0;