diff options
author | Guo-Fu Tseng <cooldavid@cooldavid.org> | 2009-02-27 17:54:07 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-03-01 20:39:31 -0800 |
commit | 07c8d2aad7db8c649a49a22f713f83e6f24b8edd (patch) | |
tree | 0570e3df364c19bd723c51caccf51c664d768f2f /drivers/net/jme.c | |
parent | fc1f209514691af9167e462880e858efc8b22d83 (diff) | |
download | linux-stable-07c8d2aad7db8c649a49a22f713f83e6f24b8edd.tar.gz linux-stable-07c8d2aad7db8c649a49a22f713f83e6f24b8edd.tar.bz2 linux-stable-07c8d2aad7db8c649a49a22f713f83e6f24b8edd.zip |
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, goto err_out_free_shadow; } - msg_probe(jme, "JMC250 gigabit%s ver:%x rev:%x macaddr:%pM\n", + msg_probe(jme, "%s%s ver:%x rev:%x macaddr:%pM\n", + (jme->pdev->device == PCI_DEVICE_ID_JMICRON_JMC250) ? + "JMC250 Gigabit Ethernet" : + (jme->pdev->device == PCI_DEVICE_ID_JMICRON_JMC260) ? + "JMC260 Fast Ethernet" : "Unknown", (jme->fpgaver != 0) ? " (FPGA)" : "", (jme->fpgaver != 0) ? jme->fpgaver : jme->chiprev, jme->rev, netdev->dev_addr); @@ -3002,7 +3006,7 @@ static struct pci_driver jme_driver = { static int __init jme_init_module(void) { - printk(KERN_INFO PFX "JMicron JMC250 gigabit ethernet " + printk(KERN_INFO PFX "JMicron JMC2XX ethernet " "driver version %s\n", DRV_VERSION); return pci_register_driver(&jme_driver); } |