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
/
atari_bionet.c
diff --git
a/drivers/net/atari_bionet.c
b/drivers/net/atari_bionet.c
index
92a2ec2
..
5e5f80b
100644
(file)
--- a/
drivers/net/atari_bionet.c
+++ b/
drivers/net/atari_bionet.c
@@
-97,6
+97,7
@@
static char version[] =
#include <linux/delay.h>
#include <linux/timer.h>
#include <linux/init.h>
#include <linux/delay.h>
#include <linux/timer.h>
#include <linux/init.h>
+#include <linux/bitops.h>
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
@@
-105,7
+106,6
@@
static char version[] =
#include <asm/setup.h>
#include <asm/pgtable.h>
#include <asm/system.h>
#include <asm/setup.h>
#include <asm/pgtable.h>
#include <asm/system.h>
-#include <asm/bitops.h>
#include <asm/io.h>
#include <asm/dma.h>
#include <asm/atarihw.h>
#include <asm/io.h>
#include <asm/dma.h>
#include <asm/atarihw.h>
@@
-123,7
+123,7
@@
static char version[] =
* Global variable 'bionet_debug'. Can be set at load time by 'insmod'
*/
unsigned int bionet_debug = NET_DEBUG;
* Global variable 'bionet_debug'. Can be set at load time by 'insmod'
*/
unsigned int bionet_debug = NET_DEBUG;
-
MODULE_PARM(bionet_debug, "i"
);
+
module_param(bionet_debug, int, 0
);
MODULE_PARM_DESC(bionet_debug, "bionet debug level (0-2)");
MODULE_LICENSE("GPL");
MODULE_PARM_DESC(bionet_debug, "bionet debug level (0-2)");
MODULE_LICENSE("GPL");
@@
-155,7
+155,7
@@
static int bionet_close(struct net_device *dev);
static struct net_device_stats *net_get_stats(struct net_device *dev);
static void bionet_tick(unsigned long);
static struct net_device_stats *net_get_stats(struct net_device *dev);
static void bionet_tick(unsigned long);
-static
struct timer_list bionet_timer = TIMER_INITIALIZER(
bionet_tick, 0, 0);
+static
DEFINE_TIMER(bionet_timer,
bionet_tick, 0, 0);
#define STRAM_ADDR(a) (((a) & 0xff000000) == 0)
#define STRAM_ADDR(a) (((a) & 0xff000000) == 0)