git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fixes' of git://git.linux-nfs.org/pub/linux/nfs-2.6
[pandora-kernel.git]
/
drivers
/
net
/
82596.c
diff --git
a/drivers/net/82596.c
b/drivers/net/82596.c
index
7e2ca95
..
257d3bc
100644
(file)
--- 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;
{
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;
}
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;
module_param(debug, int, 0);
MODULE_PARM_DESC(debug, "i82596 debug mask");
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;
{
if (debug >= 0)
i596_debug = debug;
@@
-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);
#ifdef __mc68000__
{
unregister_netdev(dev_82596);
#ifdef __mc68000__