diff options
Diffstat (limited to 'arch/m68k/atari')
-rw-r--r-- | arch/m68k/atari/config.c | 2 | ||||
-rw-r--r-- | arch/m68k/atari/stdma.c | 4 | ||||
-rw-r--r-- | arch/m68k/atari/time.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/m68k/atari/config.c b/arch/m68k/atari/config.c index 76760eebbbc5..ca5cd4344e3d 100644 --- a/arch/m68k/atari/config.c +++ b/arch/m68k/atari/config.c | |||
@@ -62,7 +62,7 @@ static void atari_heartbeat( int on ); | |||
62 | #endif | 62 | #endif |
63 | 63 | ||
64 | /* atari specific timer functions (in time.c) */ | 64 | /* atari specific timer functions (in time.c) */ |
65 | extern void atari_sched_init(irqreturn_t (*)(int, void *)); | 65 | extern void atari_sched_init(irq_handler_t ); |
66 | extern unsigned long atari_gettimeoffset (void); | 66 | extern unsigned long atari_gettimeoffset (void); |
67 | extern int atari_mste_hwclk (int, struct rtc_time *); | 67 | extern int atari_mste_hwclk (int, struct rtc_time *); |
68 | extern int atari_tt_hwclk (int, struct rtc_time *); | 68 | extern int atari_tt_hwclk (int, struct rtc_time *); |
diff --git a/arch/m68k/atari/stdma.c b/arch/m68k/atari/stdma.c index 5283c73d3f77..d64b5804e980 100644 --- a/arch/m68k/atari/stdma.c +++ b/arch/m68k/atari/stdma.c | |||
@@ -44,7 +44,7 @@ | |||
44 | 44 | ||
45 | static int stdma_locked; /* the semaphore */ | 45 | static int stdma_locked; /* the semaphore */ |
46 | /* int func to be called */ | 46 | /* int func to be called */ |
47 | static irqreturn_t (*stdma_isr)(int, void *); | 47 | static irq_handler_t stdma_isr; |
48 | static void *stdma_isr_data; /* data passed to isr */ | 48 | static void *stdma_isr_data; /* data passed to isr */ |
49 | static DECLARE_WAIT_QUEUE_HEAD(stdma_wait); /* wait queue for ST-DMA */ | 49 | static DECLARE_WAIT_QUEUE_HEAD(stdma_wait); /* wait queue for ST-DMA */ |
50 | 50 | ||
@@ -75,7 +75,7 @@ static irqreturn_t stdma_int (int irq, void *dummy); | |||
75 | * | 75 | * |
76 | */ | 76 | */ |
77 | 77 | ||
78 | void stdma_lock(irqreturn_t (*handler)(int, void *), void *data) | 78 | void stdma_lock(irq_handler_t handler, void *data) |
79 | { | 79 | { |
80 | unsigned long flags; | 80 | unsigned long flags; |
81 | 81 | ||
diff --git a/arch/m68k/atari/time.c b/arch/m68k/atari/time.c index b8fe71cfc62c..c44df4a4a331 100644 --- a/arch/m68k/atari/time.c +++ b/arch/m68k/atari/time.c | |||
@@ -20,7 +20,7 @@ | |||
20 | #include <asm/atariints.h> | 20 | #include <asm/atariints.h> |
21 | 21 | ||
22 | void __init | 22 | void __init |
23 | atari_sched_init(irqreturn_t (*timer_routine)(int, void *)) | 23 | atari_sched_init(irq_handler_t timer_routine) |
24 | { | 24 | { |
25 | /* set Timer C data Register */ | 25 | /* set Timer C data Register */ |
26 | mfp.tim_dt_c = INT_TICKS; | 26 | mfp.tim_dt_c = INT_TICKS; |