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
vserver 2.0 rc7
[linux-2.6.git]
/
drivers
/
net
/
appletalk
/
ltpc.c
diff --git
a/drivers/net/appletalk/ltpc.c
b/drivers/net/appletalk/ltpc.c
index
70a7a18
..
db4f369
100644
(file)
--- a/
drivers/net/appletalk/ltpc.c
+++ b/
drivers/net/appletalk/ltpc.c
@@
-227,17
+227,17
@@
static int dma;
#include <linux/delay.h>
#include <linux/timer.h>
#include <linux/atalk.h>
#include <linux/delay.h>
#include <linux/timer.h>
#include <linux/atalk.h>
+#include <linux/bitops.h>
#include <asm/system.h>
#include <asm/system.h>
-#include <asm/bitops.h>
#include <asm/dma.h>
#include <asm/io.h>
/* our stuff */
#include "ltpc.h"
#include <asm/dma.h>
#include <asm/io.h>
/* our stuff */
#include "ltpc.h"
-static
spinlock_t txqueue_lock = SPIN_LOCK_UNLOCKED
;
-static
spinlock_t mbox_lock = SPIN_LOCK_UNLOCKED
;
+static
DEFINE_SPINLOCK(txqueue_lock)
;
+static
DEFINE_SPINLOCK(mbox_lock)
;
/* function prototypes */
static int do_read(struct net_device *dev, void *cbuf, int cbuflen,
/* function prototypes */
static int do_read(struct net_device *dev, void *cbuf, int cbuflen,
@@
-1039,7
+1039,7
@@
struct net_device * __init ltpc_probe(void)
unsigned long f;
unsigned long timeout;
unsigned long f;
unsigned long timeout;
- dev = alloc_
netdev(sizeof(struct ltpc_private), "lt%d", ltalk_setup
);
+ dev = alloc_
ltalkdev(sizeof(struct ltpc_private)
);
if (!dev)
goto out;
if (!dev)
goto out;
@@
-1257,10
+1257,10
@@
static struct net_device *dev_ltpc;
#ifdef MODULE
MODULE_LICENSE("GPL");
#ifdef MODULE
MODULE_LICENSE("GPL");
-
MODULE_PARM(debug, "i"
);
-
MODULE_PARM(io, "i"
);
-
MODULE_PARM(irq, "i"
);
-
MODULE_PARM(dma, "i"
);
+
module_param(debug, int, 0
);
+
module_param(io, int, 0
);
+
module_param(irq, int, 0
);
+
module_param(dma, int, 0
);
int __init init_module(void)
int __init init_module(void)