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 core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
net
/
atari_pamsnet.c
diff --git
a/drivers/net/atari_pamsnet.c
b/drivers/net/atari_pamsnet.c
index
c74e586
..
3b54361
100644
(file)
--- a/
drivers/net/atari_pamsnet.c
+++ b/
drivers/net/atari_pamsnet.c
@@
-88,9
+88,9
@@
static char *version =
#include <linux/in.h>
#include <linux/slab.h>
#include <linux/string.h>
#include <linux/in.h>
#include <linux/slab.h>
#include <linux/string.h>
+#include <linux/bitops.h>
#include <asm/system.h>
#include <asm/pgtable.h>
#include <asm/system.h>
#include <asm/pgtable.h>
-#include <asm/bitops.h>
#include <asm/io.h>
#include <asm/dma.h>
#include <linux/errno.h>
#include <asm/io.h>
#include <asm/dma.h>
#include <linux/errno.h>
@@
-119,7
+119,7
@@
static char *version =
* Global variable 'pamsnet_debug'. Can be set at load time by 'insmod'
*/
unsigned int pamsnet_debug = NET_DEBUG;
* Global variable 'pamsnet_debug'. Can be set at load time by 'insmod'
*/
unsigned int pamsnet_debug = NET_DEBUG;
-
MODULE_PARM(pamsnet_debug, "i"
);
+
module_param(pamsnet_debug, int, 0
);
MODULE_PARM_DESC(pamsnet_debug, "pamsnet debug enable (0-1)");
MODULE_LICENSE("GPL");
MODULE_PARM_DESC(pamsnet_debug, "pamsnet debug enable (0-1)");
MODULE_LICENSE("GPL");
@@
-163,9
+163,9
@@
static int pamsnet_close(struct net_device *dev);
static struct net_device_stats *net_get_stats(struct net_device *dev);
static void pamsnet_tick(unsigned long);
static struct net_device_stats *net_get_stats(struct net_device *dev);
static void pamsnet_tick(unsigned long);
-static irqreturn_t pamsnet_intr(int irq, void *data
, struct pt_regs *fp
);
+static irqreturn_t pamsnet_intr(int irq, void *data);
-static
struct timer_list pamsnet_timer = TIMER_INITIALIZER(
pamsnet_tick, 0, 0);
+static
DEFINE_TIMER(pamsnet_timer,
pamsnet_tick, 0, 0);
#define STRAM_ADDR(a) (((a) & 0xff000000) == 0)
#define STRAM_ADDR(a) (((a) & 0xff000000) == 0)
@@
-494,7
+494,6
@@
static irqreturn_t
pamsnet_intr(irq, data, fp)
int irq;
void *data;
pamsnet_intr(irq, data, fp)
int irq;
void *data;
- struct pt_regs *fp;
{
return IRQ_HANDLED;
}
{
return IRQ_HANDLED;
}
@@
-857,7
+856,7
@@
pamsnet_close(struct net_device *dev) {
/* Get the current statistics.
This may be called with the card open or closed.
*/
/* Get the current statistics.
This may be called with the card open or closed.
*/
-static struct net_device_stats *net_get_stats(struct net_device *dev)
+static struct net_device_stats *net_get_stats(struct net_device *dev)
{
struct net_local *lp = netdev_priv(dev);
return &lp->stats;
{
struct net_local *lp = netdev_priv(dev);
return &lp->stats;