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
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
net
/
sun3lance.c
diff --git
a/drivers/net/sun3lance.c
b/drivers/net/sun3lance.c
index
2dcadb1
..
01bdb23
100644
(file)
--- a/
drivers/net/sun3lance.c
+++ b/
drivers/net/sun3lance.c
@@
-55,7
+55,7
@@
static char *version = "sun3lance.c: v1.2 1/12/2001 Sam Creasey (sammy@sammy.ne
/* sun3/60 addr/irq for the lance chip. If your sun is different,
change this. */
#define LANCE_OBIO 0x120000
/* sun3/60 addr/irq for the lance chip. If your sun is different,
change this. */
#define LANCE_OBIO 0x120000
-#define LANCE_IRQ IRQ
_AUTO_
3
+#define LANCE_IRQ IRQ3
/* Debug level:
* 0 = silent, print only serious errors
/* Debug level:
* 0 = silent, print only serious errors
@@
-71,7
+71,7
@@
static int lance_debug = LANCE_DEBUG;
#else
static int lance_debug = 1;
#endif
#else
static int lance_debug = 1;
#endif
-
module_param(lance_debug, int, 0
);
+
MODULE_PARM(lance_debug, "i"
);
MODULE_PARM_DESC(lance_debug, "SUN3 Lance debug level (0-3)");
MODULE_LICENSE("GPL");
MODULE_PARM_DESC(lance_debug, "SUN3 Lance debug level (0-3)");
MODULE_LICENSE("GPL");
@@
-341,7
+341,7
@@
static int __init lance_probe( struct net_device *dev)
REGA(CSR0) = CSR0_STOP;
REGA(CSR0) = CSR0_STOP;
- request_irq(LANCE_IRQ, lance_interrupt,
IRQF_DISABLED
, "SUN3 Lance", dev);
+ request_irq(LANCE_IRQ, lance_interrupt,
SA_INTERRUPT
, "SUN3 Lance", dev);
dev->irq = (unsigned short)LANCE_IRQ;
dev->irq = (unsigned short)LANCE_IRQ;