Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 33480
b: refs/heads/master
c: 864fe05
h: refs/heads/master
v: v3
  • Loading branch information
Andrew Morton authored and Jeff Garzik committed Aug 19, 2006
1 parent f850604 commit f484d88
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 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: 41ace1861a93f12f70ff10026fb1539fea38fcf8
refs/heads/master: 864fe05dfa4ff3e230acf3b4ccf878b6f22603c4
9 changes: 5 additions & 4 deletions trunk/drivers/net/82596.c
Original file line number Diff line number Diff line change
Expand Up @@ -899,7 +899,7 @@ static inline int i596_rx(struct net_device *dev)
}


static inline void i596_cleanup_cmd(struct net_device *dev, struct i596_private *lp)
static void i596_cleanup_cmd(struct net_device *dev, struct i596_private *lp)
{
struct i596_cmd *ptr;

Expand Down Expand Up @@ -932,7 +932,8 @@ static inline void i596_cleanup_cmd(struct net_device *dev, struct i596_private
lp->scb.cmd = I596_NULL;
}

static inline void i596_reset(struct net_device *dev, struct i596_private *lp, int ioaddr)
static void i596_reset(struct net_device *dev, struct i596_private *lp,
int ioaddr)
{
unsigned long flags;

Expand Down Expand Up @@ -1578,7 +1579,7 @@ static int debug = -1;
module_param(debug, int, 0);
MODULE_PARM_DESC(debug, "i82596 debug mask");

int init_module(void)
int __init init_module(void)
{
if (debug >= 0)
i596_debug = debug;
Expand All @@ -1588,7 +1589,7 @@ int init_module(void)
return 0;
}

void cleanup_module(void)
void __exit cleanup_module(void)
{
unregister_netdev(dev_82596);
#ifdef __mc68000__
Expand Down

0 comments on commit f484d88

Please sign in to comment.