projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] 3c59x: use mii_check_media
[cascardo/linux.git]
/
drivers
/
net
/
tulip
/
uli526x.c
diff --git
a/drivers/net/tulip/uli526x.c
b/drivers/net/tulip/uli526x.c
index
5ae22b7
..
238e9c7
100644
(file)
--- a/
drivers/net/tulip/uli526x.c
+++ b/
drivers/net/tulip/uli526x.c
@@
-21,7
+21,6
@@
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/timer.h>
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/timer.h>
-#include <linux/ptrace.h>
#include <linux/errno.h>
#include <linux/ioport.h>
#include <linux/slab.h>
#include <linux/errno.h>
#include <linux/ioport.h>
#include <linux/slab.h>
@@
-34,6
+33,7
@@
#include <linux/skbuff.h>
#include <linux/delay.h>
#include <linux/spinlock.h>
#include <linux/skbuff.h>
#include <linux/delay.h>
#include <linux/spinlock.h>
+#include <linux/dma-mapping.h>
#include <asm/processor.h>
#include <asm/bitops.h>
#include <asm/processor.h>
#include <asm/bitops.h>
@@
-214,7
+214,7
@@
static u32 uli526x_cr6_user_set;
/* For module input parameter */
static int debug;
static u32 cr6set;
/* For module input parameter */
static int debug;
static u32 cr6set;
-static
unsigned char
mode = 8;
+static
int
mode = 8;
/* function declaration ------------------------------------- */
static int uli526x_open(struct net_device *);
/* function declaration ------------------------------------- */
static int uli526x_open(struct net_device *);
@@
-1689,9
+1689,9
@@
MODULE_AUTHOR("Peer Chen, peer.chen@uli.com.tw");
MODULE_DESCRIPTION("ULi M5261/M5263 fast ethernet driver");
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("ULi M5261/M5263 fast ethernet driver");
MODULE_LICENSE("GPL");
-
MODULE_PARM(debug, "i"
);
-
MODULE_PARM(mode, "i"
);
-
MODULE_PARM(cr6set, "i"
);
+
module_param(debug, int, 0644
);
+
module_param(mode, int, 0
);
+
module_param(cr6set, int, 0
);
MODULE_PARM_DESC(debug, "ULi M5261/M5263 enable debugging (0-1)");
MODULE_PARM_DESC(mode, "ULi M5261/M5263: Bit 0: 10/100Mbps, bit 2: duplex, bit 8: HomePNA");
MODULE_PARM_DESC(debug, "ULi M5261/M5263 enable debugging (0-1)");
MODULE_PARM_DESC(mode, "ULi M5261/M5263: Bit 0: 10/100Mbps, bit 2: duplex, bit 8: HomePNA");