diff options
Diffstat (limited to 'arch/m68knommu')
-rw-r--r-- | arch/m68knommu/platform/5307/pit.c | 2 | ||||
-rw-r--r-- | arch/m68knommu/platform/5307/timers.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/m68knommu/platform/5307/pit.c b/arch/m68knommu/platform/5307/pit.c index 994c893df1a4..9dc5688f71b5 100644 --- a/arch/m68knommu/platform/5307/pit.c +++ b/arch/m68knommu/platform/5307/pit.c | |||
@@ -48,7 +48,7 @@ void coldfire_pit_init(irqreturn_t (*handler)(int, void *, struct pt_regs *)) | |||
48 | volatile unsigned char *icrp; | 48 | volatile unsigned char *icrp; |
49 | volatile unsigned long *imrp; | 49 | volatile unsigned long *imrp; |
50 | 50 | ||
51 | request_irq(MCFINT_VECBASE + MCFINT_PIT1, handler, SA_INTERRUPT, | 51 | request_irq(MCFINT_VECBASE + MCFINT_PIT1, handler, IRQF_DISABLED, |
52 | "ColdFire Timer", NULL); | 52 | "ColdFire Timer", NULL); |
53 | 53 | ||
54 | icrp = (volatile unsigned char *) (MCF_IPSBAR + MCFICM_INTC0 + | 54 | icrp = (volatile unsigned char *) (MCF_IPSBAR + MCFICM_INTC0 + |
diff --git a/arch/m68knommu/platform/5307/timers.c b/arch/m68knommu/platform/5307/timers.c index c3a9755c2d1f..24781f009337 100644 --- a/arch/m68knommu/platform/5307/timers.c +++ b/arch/m68knommu/platform/5307/timers.c | |||
@@ -61,7 +61,7 @@ void coldfire_timer_init(irqreturn_t (*handler)(int, void *, struct pt_regs *)) | |||
61 | __raw_writew(MCFTIMER_TMR_ENORI | MCFTIMER_TMR_CLK16 | | 61 | __raw_writew(MCFTIMER_TMR_ENORI | MCFTIMER_TMR_CLK16 | |
62 | MCFTIMER_TMR_RESTART | MCFTIMER_TMR_ENABLE, TA(MCFTIMER_TMR)); | 62 | MCFTIMER_TMR_RESTART | MCFTIMER_TMR_ENABLE, TA(MCFTIMER_TMR)); |
63 | 63 | ||
64 | request_irq(mcf_timervector, handler, SA_INTERRUPT, "timer", NULL); | 64 | request_irq(mcf_timervector, handler, IRQF_DISABLED, "timer", NULL); |
65 | mcf_settimericr(1, mcf_timerlevel); | 65 | mcf_settimericr(1, mcf_timerlevel); |
66 | 66 | ||
67 | #ifdef CONFIG_HIGHPROFILE | 67 | #ifdef CONFIG_HIGHPROFILE |
@@ -125,7 +125,7 @@ void coldfire_profile_init(void) | |||
125 | MCFTIMER_TMR_RESTART | MCFTIMER_TMR_ENABLE, PA(MCFTIMER_TMR)); | 125 | MCFTIMER_TMR_RESTART | MCFTIMER_TMR_ENABLE, PA(MCFTIMER_TMR)); |
126 | 126 | ||
127 | request_irq(mcf_profilevector, coldfire_profile_tick, | 127 | request_irq(mcf_profilevector, coldfire_profile_tick, |
128 | (SA_INTERRUPT | IRQ_FLG_FAST), "profile timer", NULL); | 128 | (IRQF_DISABLED | IRQ_FLG_FAST), "profile timer", NULL); |
129 | mcf_settimericr(2, 7); | 129 | mcf_settimericr(2, 7); |
130 | } | 130 | } |
131 | 131 | ||