diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-05 00:00:52 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-05 00:00:52 +0200 |
| commit | bfe87dbc7b4da5b05a1a78480e996787a500cc6f (patch) | |
| tree | f5730e4f9ae9b6ef8d21de3aedd8dc9f3af10bc5 /drivers/net/tokenring/olympic.c | |
| parent | [VLAN]: Fix egress priority mappings leak. (diff) | |
| parent | fix endian lossage in forcedeth (diff) | |
| download | linux-bfe87dbc7b4da5b05a1a78480e996787a500cc6f.tar.xz linux-bfe87dbc7b4da5b05a1a78480e996787a500cc6f.zip | |
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/tokenring/olympic.c')
| -rw-r--r-- | drivers/net/tokenring/olympic.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/tokenring/olympic.c b/drivers/net/tokenring/olympic.c index 433c994ea9d8..db4ca4f0b846 100644 --- a/drivers/net/tokenring/olympic.c +++ b/drivers/net/tokenring/olympic.c @@ -117,7 +117,7 @@ * Official releases will only have an a.b.c version number format. */ -static char version[] __devinitdata = +static char version[] = "Olympic.c v1.0.5 6/04/02 - Peter De Schrijver & Mike Phillips" ; static char *open_maj_error[] = {"No error", "Lobe Media Test", "Physical Insertion", @@ -290,7 +290,7 @@ op_disable_dev: return i; } -static int __devinit olympic_init(struct net_device *dev) +static int olympic_init(struct net_device *dev) { struct olympic_private *olympic_priv; u8 __iomem *olympic_mmio, *init_srb,*adapter_addr; @@ -434,7 +434,7 @@ static int __devinit olympic_init(struct net_device *dev) } -static int __devinit olympic_open(struct net_device *dev) +static int olympic_open(struct net_device *dev) { struct olympic_private *olympic_priv=netdev_priv(dev); u8 __iomem *olympic_mmio=olympic_priv->olympic_mmio,*init_srb; |