diff options
| author | Andrew Morton <akpm@osdl.org> | 2006-08-14 22:59:57 -0700 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-19 17:40:15 -0400 |
| commit | 864fe05dfa4ff3e230acf3b4ccf878b6f22603c4 (patch) | |
| tree | be3eb18d68f4a60a4f5341e5163981c4638bdaf8 /drivers/net/82596.c | |
| parent | 41ace1861a93f12f70ff10026fb1539fea38fcf8 (diff) | |
| download | op-kernel-dev-864fe05dfa4ff3e230acf3b4ccf878b6f22603c4.zip op-kernel-dev-864fe05dfa4ff3e230acf3b4ccf878b6f22603c4.tar.gz | |
[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: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/82596.c')
| -rw-r--r-- | drivers/net/82596.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/82596.c b/drivers/net/82596.c index 7e2ca95..257d3bc 100644 --- a/drivers/net/82596.c +++ b/drivers/net/82596.c @@ -899,7 +899,7 @@ memory_squeeze: } -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; @@ -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; @@ -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; @@ -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__ |
