Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 24069
b: refs/heads/master
c: 6123860
h: refs/heads/master
i:
  24067: 3e3cec5
v: v3
  • Loading branch information
Steffen Klassert authored and Linus Torvalds committed Mar 26, 2006
1 parent cb512ed commit a206830
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 8 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: 373a688742d7ba31cafc4c7b9bc09eba257860bd
refs/heads/master: 61238602622c965db052927c89901aa08f88d933
9 changes: 2 additions & 7 deletions trunk/drivers/net/3c59x.c
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,6 @@


#define DRV_NAME "3c59x"
#define DRV_VERSION "LK1.1.19"
#define DRV_RELDATE "10 Nov 2002"



Expand Down Expand Up @@ -275,10 +273,8 @@ static char version[] __devinitdata =
DRV_NAME ": Donald Becker and others. www.scyld.com/network/vortex.html\n";

MODULE_AUTHOR("Donald Becker <becker@scyld.com>");
MODULE_DESCRIPTION("3Com 3c59x/3c9xx ethernet driver "
DRV_VERSION " " DRV_RELDATE);
MODULE_DESCRIPTION("3Com 3c59x/3c9xx ethernet driver ");
MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION);


/* Operational parameter that usually are not changed. */
Expand Down Expand Up @@ -1236,7 +1232,7 @@ static int __devinit vortex_probe1(struct device *gendev,
if (print_info)
printk (KERN_INFO "See Documentation/networking/vortex.txt\n");

printk(KERN_INFO "%s: 3Com %s %s at %p. Vers " DRV_VERSION "\n",
printk(KERN_INFO "%s: 3Com %s %s at %p.\n",
print_name,
pdev ? "PCI" : "EISA",
vci->name,
Expand Down Expand Up @@ -3040,7 +3036,6 @@ static void vortex_get_drvinfo(struct net_device *dev,
struct vortex_private *vp = netdev_priv(dev);

strcpy(info->driver, DRV_NAME);
strcpy(info->version, DRV_VERSION);
if (VORTEX_PCI(vp)) {
strcpy(info->bus_info, pci_name(VORTEX_PCI(vp)));
} else {
Expand Down

0 comments on commit a206830

Please sign in to comment.