summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/m68k/atari/atakeyb.c5
-rw-r--r--arch/m68k/atari/stdma.c2
-rw-r--r--arch/m68k/atari/time.c3
-rw-r--r--arch/m68k/include/asm/atariints.h5
4 files changed, 4 insertions, 11 deletions
diff --git a/arch/m68k/atari/atakeyb.c b/arch/m68k/atari/atakeyb.c
index 7bea01ceff55..264db1126803 100644
--- a/arch/m68k/atari/atakeyb.c
+++ b/arch/m68k/atari/atakeyb.c
@@ -504,9 +504,8 @@ int atari_keyb_init(void)
504 kb_state.state = KEYBOARD; 504 kb_state.state = KEYBOARD;
505 kb_state.len = 0; 505 kb_state.len = 0;
506 506
507 error = request_irq(IRQ_MFP_ACIA, atari_keyboard_interrupt, 507 error = request_irq(IRQ_MFP_ACIA, atari_keyboard_interrupt, 0,
508 IRQ_TYPE_SLOW, "keyboard,mouse,MIDI", 508 "keyboard,mouse,MIDI", atari_keyboard_interrupt);
509 atari_keyboard_interrupt);
510 if (error) 509 if (error)
511 return error; 510 return error;
512 511
diff --git a/arch/m68k/atari/stdma.c b/arch/m68k/atari/stdma.c
index e5a66596b116..ba65f942d0c7 100644
--- a/arch/m68k/atari/stdma.c
+++ b/arch/m68k/atari/stdma.c
@@ -198,7 +198,7 @@ EXPORT_SYMBOL(stdma_islocked);
198void __init stdma_init(void) 198void __init stdma_init(void)
199{ 199{
200 stdma_isr = NULL; 200 stdma_isr = NULL;
201 if (request_irq(IRQ_MFP_FDC, stdma_int, IRQ_TYPE_SLOW | IRQF_SHARED, 201 if (request_irq(IRQ_MFP_FDC, stdma_int, IRQF_SHARED,
202 "ST-DMA floppy,ACSI,IDE,Falcon-SCSI", stdma_int)) 202 "ST-DMA floppy,ACSI,IDE,Falcon-SCSI", stdma_int))
203 pr_err("Couldn't register ST-DMA interrupt\n"); 203 pr_err("Couldn't register ST-DMA interrupt\n");
204} 204}
diff --git a/arch/m68k/atari/time.c b/arch/m68k/atari/time.c
index da8f981c36d6..c549b48174ec 100644
--- a/arch/m68k/atari/time.c
+++ b/arch/m68k/atari/time.c
@@ -32,8 +32,7 @@ atari_sched_init(irq_handler_t timer_routine)
32 /* start timer C, div = 1:100 */ 32 /* start timer C, div = 1:100 */
33 st_mfp.tim_ct_cd = (st_mfp.tim_ct_cd & 15) | 0x60; 33 st_mfp.tim_ct_cd = (st_mfp.tim_ct_cd & 15) | 0x60;
34 /* install interrupt service routine for MFP Timer C */ 34 /* install interrupt service routine for MFP Timer C */
35 if (request_irq(IRQ_MFP_TIMC, timer_routine, IRQ_TYPE_SLOW, 35 if (request_irq(IRQ_MFP_TIMC, timer_routine, 0, "timer", timer_routine))
36 "timer", timer_routine))
37 pr_err("Couldn't register timer interrupt\n"); 36 pr_err("Couldn't register timer interrupt\n");
38} 37}
39 38
diff --git a/arch/m68k/include/asm/atariints.h b/arch/m68k/include/asm/atariints.h
index 953e0ac6855e..6321c4495620 100644
--- a/arch/m68k/include/asm/atariints.h
+++ b/arch/m68k/include/asm/atariints.h
@@ -40,11 +40,6 @@
40/* convert irq_handler index to vector number */ 40/* convert irq_handler index to vector number */
41#define IRQ_SOURCE_TO_VECTOR(i) ((i) + ((i) < 8 ? 0x18 : (0x40-8))) 41#define IRQ_SOURCE_TO_VECTOR(i) ((i) + ((i) < 8 ? 0x18 : (0x40-8)))
42 42
43/* interrupt service types */
44#define IRQ_TYPE_SLOW 0
45#define IRQ_TYPE_FAST 1
46#define IRQ_TYPE_PRIO 2
47
48/* ST-MFP interrupts */ 43/* ST-MFP interrupts */
49#define IRQ_MFP_BUSY (8) 44#define IRQ_MFP_BUSY (8)
50#define IRQ_MFP_DCD (9) 45#define IRQ_MFP_DCD (9)