diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/atari_bionet.c | 2 | ||||
-rw-r--r-- | drivers/net/atari_pamsnet.c | 2 | ||||
-rw-r--r-- | drivers/net/cris/eth_v10.c | 6 | ||||
-rw-r--r-- | drivers/net/hamradio/yam.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/atari_bionet.c b/drivers/net/atari_bionet.c index 1798ce7262c9..0095384ff454 100644 --- a/drivers/net/atari_bionet.c +++ b/drivers/net/atari_bionet.c | |||
@@ -155,7 +155,7 @@ static int bionet_close(struct net_device *dev); | |||
155 | static struct net_device_stats *net_get_stats(struct net_device *dev); | 155 | static struct net_device_stats *net_get_stats(struct net_device *dev); |
156 | static void bionet_tick(unsigned long); | 156 | static void bionet_tick(unsigned long); |
157 | 157 | ||
158 | static struct timer_list bionet_timer = TIMER_INITIALIZER(bionet_tick, 0, 0); | 158 | static DEFINE_TIMER(bionet_timer, bionet_tick, 0, 0); |
159 | 159 | ||
160 | #define STRAM_ADDR(a) (((a) & 0xff000000) == 0) | 160 | #define STRAM_ADDR(a) (((a) & 0xff000000) == 0) |
161 | 161 | ||
diff --git a/drivers/net/atari_pamsnet.c b/drivers/net/atari_pamsnet.c index 81c362c8cb97..8b997809f9de 100644 --- a/drivers/net/atari_pamsnet.c +++ b/drivers/net/atari_pamsnet.c | |||
@@ -165,7 +165,7 @@ static void pamsnet_tick(unsigned long); | |||
165 | 165 | ||
166 | static irqreturn_t pamsnet_intr(int irq, void *data, struct pt_regs *fp); | 166 | static irqreturn_t pamsnet_intr(int irq, void *data, struct pt_regs *fp); |
167 | 167 | ||
168 | static struct timer_list pamsnet_timer = TIMER_INITIALIZER(pamsnet_tick, 0, 0); | 168 | static DEFINE_TIMER(pamsnet_timer, pamsnet_tick, 0, 0); |
169 | 169 | ||
170 | #define STRAM_ADDR(a) (((a) & 0xff000000) == 0) | 170 | #define STRAM_ADDR(a) (((a) & 0xff000000) == 0) |
171 | 171 | ||
diff --git a/drivers/net/cris/eth_v10.c b/drivers/net/cris/eth_v10.c index 442670860fca..b68b9cad76e9 100644 --- a/drivers/net/cris/eth_v10.c +++ b/drivers/net/cris/eth_v10.c | |||
@@ -384,8 +384,8 @@ static unsigned int mdio_phy_addr; /* Transciever address */ | |||
384 | static unsigned int network_tr_ctrl_shadow = 0; | 384 | static unsigned int network_tr_ctrl_shadow = 0; |
385 | 385 | ||
386 | /* Network speed indication. */ | 386 | /* Network speed indication. */ |
387 | static struct timer_list speed_timer = TIMER_INITIALIZER(NULL, 0, 0); | 387 | static DEFINE_TIMER(speed_timer, NULL, 0, 0); |
388 | static struct timer_list clear_led_timer = TIMER_INITIALIZER(NULL, 0, 0); | 388 | static DEFINE_TIMER(clear_led_timer, NULL, 0, 0); |
389 | static int current_speed; /* Speed read from transceiver */ | 389 | static int current_speed; /* Speed read from transceiver */ |
390 | static int current_speed_selection; /* Speed selected by user */ | 390 | static int current_speed_selection; /* Speed selected by user */ |
391 | static unsigned long led_next_time; | 391 | static unsigned long led_next_time; |
@@ -393,7 +393,7 @@ static int led_active; | |||
393 | static int rx_queue_len; | 393 | static int rx_queue_len; |
394 | 394 | ||
395 | /* Duplex */ | 395 | /* Duplex */ |
396 | static struct timer_list duplex_timer = TIMER_INITIALIZER(NULL, 0, 0); | 396 | static DEFINE_TIMER(duplex_timer, NULL, 0, 0); |
397 | static int full_duplex; | 397 | static int full_duplex; |
398 | static enum duplex current_duplex; | 398 | static enum duplex current_duplex; |
399 | 399 | ||
diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c index 41213ef602dc..f52ee3162c51 100644 --- a/drivers/net/hamradio/yam.c +++ b/drivers/net/hamradio/yam.c | |||
@@ -170,7 +170,7 @@ static char ax25_bcast[7] = | |||
170 | static char ax25_test[7] = | 170 | static char ax25_test[7] = |
171 | {'L' << 1, 'I' << 1, 'N' << 1, 'U' << 1, 'X' << 1, ' ' << 1, '1' << 1}; | 171 | {'L' << 1, 'I' << 1, 'N' << 1, 'U' << 1, 'X' << 1, ' ' << 1, '1' << 1}; |
172 | 172 | ||
173 | static struct timer_list yam_timer = TIMER_INITIALIZER(NULL, 0, 0); | 173 | static DEFINE_TIMER(yam_timer, NULL, 0, 0); |
174 | 174 | ||
175 | /* --------------------------------------------------------------------- */ | 175 | /* --------------------------------------------------------------------- */ |
176 | 176 | ||