diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
| commit | 905ec87e93bc9e01b15c60035cd6a50c636cbaef (patch) | |
| tree | 46fd7618d6511611ffc19eb0dd4d7bc6b90a41c2 /drivers/net/atari_pamsnet.c | |
| parent | 1d6ae775d7a948c9575658eb41184fd2e506c0df (diff) | |
| parent | 2f4ba45a75d6383b4a1201169a808ffea416ffa0 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/net/atari_pamsnet.c')
| -rw-r--r-- | drivers/net/atari_pamsnet.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 | ||