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
/
sun3lance.c
diff --git
a/drivers/net/sun3lance.c
b/drivers/net/sun3lance.c
index
f0512a4
..
d4c0002
100644
(file)
--- a/
drivers/net/sun3lance.c
+++ b/
drivers/net/sun3lance.c
@@
-36,13
+36,12
@@
static char *version = "sun3lance.c: v1.2 1/12/2001 Sam Creasey (sammy@sammy.ne
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
#include <linux/skbuff.h>
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
#include <linux/skbuff.h>
+#include <linux/bitops.h>
#include <asm/setup.h>
#include <asm/irq.h>
#include <asm/setup.h>
#include <asm/irq.h>
-#include <asm/bitops.h>
#include <asm/io.h>
#include <asm/pgtable.h>
#include <asm/io.h>
#include <asm/pgtable.h>
-#include <asm/pgalloc.h>
#include <asm/dvma.h>
#include <asm/idprom.h>
#include <asm/machines.h>
#include <asm/dvma.h>
#include <asm/idprom.h>
#include <asm/machines.h>
@@
-72,7
+71,7
@@
static int lance_debug = LANCE_DEBUG;
#else
static int lance_debug = 1;
#endif
#else
static int lance_debug = 1;
#endif
-
MODULE_PARM(lance_debug, "i"
);
+
module_param(lance_debug, int, 0
);
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");
@@
-163,7
+162,7
@@
struct lance_private {
#define MEM lp->mem
#define DREG lp->iobase[0]
#define AREG lp->iobase[1]
#define MEM lp->mem
#define DREG lp->iobase[0]
#define AREG lp->iobase[1]
-#define REGA(a) (
AREG = (a), DREG
)
+#define REGA(a) (
*( AREG = (a), &DREG )
)
/* Definitions for the Lance */
/* Definitions for the Lance */
@@
-390,7
+389,7
@@
static int __init lance_probe( struct net_device *dev)
dev->stop = &lance_close;
dev->get_stats = &lance_get_stats;
dev->set_multicast_list = &set_multicast_list;
dev->stop = &lance_close;
dev->get_stats = &lance_get_stats;
dev->set_multicast_list = &set_multicast_list;
- dev->set_mac_address =
0
;
+ dev->set_mac_address =
NULL
;
// KLUDGE -- REMOVE ME
set_bit(__LINK_STATE_PRESENT, &dev->state);
// KLUDGE -- REMOVE ME
set_bit(__LINK_STATE_PRESENT, &dev->state);