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
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
net
/
lp486e.c
diff --git
a/drivers/net/lp486e.c
b/drivers/net/lp486e.c
index
643a787
..
94d5ea1
100644
(file)
--- a/
drivers/net/lp486e.c
+++ b/
drivers/net/lp486e.c
@@
-56,8
+56,6
@@
PORT SIZE ACTION MEANING
All other communication is through memory!
*/
All other communication is through memory!
*/
-#define SLOW_DOWN_IO udelay(5)
-
#include <linux/module.h>
#include <linux/init.h>
#include <linux/delay.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/delay.h>
@@
-112,8
+110,10
@@
enum commands {
CmdDiagnose = 7
};
CmdDiagnose = 7
};
-char *CUcmdnames[8] = { "NOP", "IASetup", "Configure", "MulticastList",
- "Tx", "TDR", "Dump", "Diagnose" };
+#if 0
+static const char *CUcmdnames[8] = { "NOP", "IASetup", "Configure", "MulticastList",
+ "Tx", "TDR", "Dump", "Diagnose" };
+#endif
/* Status word bits */
#define STAT_CX 0x8000 /* The CU finished executing a command
/* Status word bits */
#define STAT_CX 0x8000 /* The CU finished executing a command
@@
-960,7
+960,7
@@
static void print_eth(char *add)
(unsigned char) add[12], (unsigned char) add[13]);
}
(unsigned char) add[12], (unsigned char) add[13]);
}
-int __init lp486e_probe(struct net_device *dev) {
+
static
int __init lp486e_probe(struct net_device *dev) {
struct i596_private *lp;
unsigned char eth_addr[6] = { 0, 0xaa, 0, 0, 0, 0 };
unsigned char *bios;
struct i596_private *lp;
unsigned char eth_addr[6] = { 0, 0xaa, 0, 0, 0, 0 };
unsigned char *bios;