Commit 864fe05d authored by Andrew Morton's avatar Andrew Morton Committed by Jeff Garzik

[PATCH] 82596 section fixes

WARNING: drivers/net/82596.o - Section mismatch: reference to .init.text:i82596_probe from .text between 'init_module' (at offset 0x141) and 'i596_add_cmd'

Also nail a couple of crazy inlines.

Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 41ace186
...@@ -899,7 +899,7 @@ static inline int i596_rx(struct net_device *dev) ...@@ -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; struct i596_cmd *ptr;
...@@ -932,7 +932,8 @@ static inline void i596_cleanup_cmd(struct net_device *dev, struct i596_private ...@@ -932,7 +932,8 @@ static inline void i596_cleanup_cmd(struct net_device *dev, struct i596_private
lp->scb.cmd = I596_NULL; 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; unsigned long flags;
...@@ -1578,7 +1579,7 @@ static int debug = -1; ...@@ -1578,7 +1579,7 @@ static int debug = -1;
module_param(debug, int, 0); module_param(debug, int, 0);
MODULE_PARM_DESC(debug, "i82596 debug mask"); MODULE_PARM_DESC(debug, "i82596 debug mask");
int init_module(void) int __init init_module(void)
{ {
if (debug >= 0) if (debug >= 0)
i596_debug = debug; i596_debug = debug;
...@@ -1588,7 +1589,7 @@ int init_module(void) ...@@ -1588,7 +1589,7 @@ int init_module(void)
return 0; return 0;
} }
void cleanup_module(void) void __exit cleanup_module(void)
{ {
unregister_netdev(dev_82596); unregister_netdev(dev_82596);
#ifdef __mc68000__ #ifdef __mc68000__
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment