git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
drivers
/
net
/
82596.c
diff --git
a/drivers/net/82596.c
b/drivers/net/82596.c
index
c835712
..
51e04db
100644
(file)
--- a/
drivers/net/82596.c
+++ b/
drivers/net/82596.c
@@
-619,7
+619,7
@@
static int init_i596_mem(struct net_device *dev)
#endif
unsigned long flags;
#endif
unsigned long flags;
- MPU_PORT(dev, PORT_RESET,
NULL
);
+ MPU_PORT(dev, PORT_RESET,
0
);
udelay(100); /* Wait 100us - seems to help */
udelay(100); /* Wait 100us - seems to help */
@@
-760,7
+760,7
@@
static int init_i596_mem(struct net_device *dev)
failed:
printk(KERN_CRIT "%s: Failed to initialise 82596\n", dev->name);
failed:
printk(KERN_CRIT "%s: Failed to initialise 82596\n", dev->name);
- MPU_PORT(dev, PORT_RESET,
NULL
);
+ MPU_PORT(dev, PORT_RESET,
0
);
return -1;
}
return -1;
}