Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 118311
b: refs/heads/master
c: 37b2a17
h: refs/heads/master
i:
  118309: 5e589e4
  118307: 65287ff
  118303: a5f9b98
v: v3
  • Loading branch information
Al Viro authored and Linus Torvalds committed Nov 1, 2008
1 parent 7c23fba commit 76d670a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 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: 9ca68233f2ec12efc950b4d15e9a761308da2b3e
refs/heads/master: 37b2a1791c8b8d630944afbe0745a08c8e8ae091
6 changes: 3 additions & 3 deletions trunk/drivers/net/3c509.c
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
#include <asm/io.h>
#include <asm/irq.h>

static char version[] __initdata = DRV_NAME ".c:" DRV_VERSION " " DRV_RELDATE " becker@scyld.com\n";
static char version[] __devinitdata = DRV_NAME ".c:" DRV_VERSION " " DRV_RELDATE " becker@scyld.com\n";

#ifdef EL3_DEBUG
static int el3_debug = EL3_DEBUG;
Expand Down Expand Up @@ -186,7 +186,7 @@ static int max_interrupt_work = 10;
static int nopnp;
#endif

static int __init el3_common_init(struct net_device *dev);
static int __devinit el3_common_init(struct net_device *dev);
static void el3_common_remove(struct net_device *dev);
static ushort id_read_eeprom(int index);
static ushort read_eeprom(int ioaddr, int index);
Expand Down Expand Up @@ -537,7 +537,7 @@ static struct mca_driver el3_mca_driver = {
static int mca_registered;
#endif /* CONFIG_MCA */

static int __init el3_common_init(struct net_device *dev)
static int __devinit el3_common_init(struct net_device *dev)
{
struct el3_private *lp = netdev_priv(dev);
int err;
Expand Down

0 comments on commit 76d670a

Please sign in to comment.