diff options
author | Guo-Fu Tseng <cooldavid@cooldavid.org> | 2009-02-27 12:54:07 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-03-01 23:39:31 -0500 |
commit | 07c8d2aad7db8c649a49a22f713f83e6f24b8edd (patch) | |
tree | 0570e3df364c19bd723c51caccf51c664d768f2f /drivers/net/jme.c | |
parent | fc1f209514691af9167e462880e858efc8b22d83 (diff) |
jme: Modifies messages to display correct hardware version
This patch modifies messages to display correct hardware version.
Signed-off-by: Guo-Fu Tseng <cooldavid@cooldavid.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/jme.c')
-rw-r--r-- | drivers/net/jme.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/jme.c b/drivers/net/jme.c index 08b34051c646..60cb99744d05 100644 --- a/drivers/net/jme.c +++ b/drivers/net/jme.c | |||
@@ -2856,7 +2856,11 @@ jme_init_one(struct pci_dev *pdev, | |||
2856 | goto err_out_free_shadow; | 2856 | goto err_out_free_shadow; |
2857 | } | 2857 | } |
2858 | 2858 | ||
2859 | msg_probe(jme, "JMC250 gigabit%s ver:%x rev:%x macaddr:%pM\n", | 2859 | msg_probe(jme, "%s%s ver:%x rev:%x macaddr:%pM\n", |
2860 | (jme->pdev->device == PCI_DEVICE_ID_JMICRON_JMC250) ? | ||
2861 | "JMC250 Gigabit Ethernet" : | ||
2862 | (jme->pdev->device == PCI_DEVICE_ID_JMICRON_JMC260) ? | ||
2863 | "JMC260 Fast Ethernet" : "Unknown", | ||
2860 | (jme->fpgaver != 0) ? " (FPGA)" : "", | 2864 | (jme->fpgaver != 0) ? " (FPGA)" : "", |
2861 | (jme->fpgaver != 0) ? jme->fpgaver : jme->chiprev, | 2865 | (jme->fpgaver != 0) ? jme->fpgaver : jme->chiprev, |
2862 | jme->rev, netdev->dev_addr); | 2866 | jme->rev, netdev->dev_addr); |
@@ -3002,7 +3006,7 @@ static struct pci_driver jme_driver = { | |||
3002 | static int __init | 3006 | static int __init |
3003 | jme_init_module(void) | 3007 | jme_init_module(void) |
3004 | { | 3008 | { |
3005 | printk(KERN_INFO PFX "JMicron JMC250 gigabit ethernet " | 3009 | printk(KERN_INFO PFX "JMicron JMC2XX ethernet " |
3006 | "driver version %s\n", DRV_VERSION); | 3010 | "driver version %s\n", DRV_VERSION); |
3007 | return pci_register_driver(&jme_driver); | 3011 | return pci_register_driver(&jme_driver); |
3008 | } | 3012 | } |