diff options
Diffstat (limited to 'arch/arm/mach-integrator')
-rw-r--r-- | arch/arm/mach-integrator/core.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-integrator/time.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-integrator/core.c index 2d7e505e748f..42021fdfa0c6 100644 --- a/arch/arm/mach-integrator/core.c +++ b/arch/arm/mach-integrator/core.c | |||
@@ -282,7 +282,7 @@ integrator_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
282 | 282 | ||
283 | static struct irqaction integrator_timer_irq = { | 283 | static struct irqaction integrator_timer_irq = { |
284 | .name = "Integrator Timer Tick", | 284 | .name = "Integrator Timer Tick", |
285 | .flags = SA_INTERRUPT | SA_TIMER, | 285 | .flags = IRQF_DISABLED | IRQF_TIMER, |
286 | .handler = integrator_timer_interrupt, | 286 | .handler = integrator_timer_interrupt, |
287 | }; | 287 | }; |
288 | 288 | ||
diff --git a/arch/arm/mach-integrator/time.c b/arch/arm/mach-integrator/time.c index bc07f52a6fd7..ee49cf790dab 100644 --- a/arch/arm/mach-integrator/time.c +++ b/arch/arm/mach-integrator/time.c | |||
@@ -125,7 +125,7 @@ static int rtc_probe(struct amba_device *dev, void *id) | |||
125 | 125 | ||
126 | xtime.tv_sec = __raw_readl(rtc_base + RTC_DR); | 126 | xtime.tv_sec = __raw_readl(rtc_base + RTC_DR); |
127 | 127 | ||
128 | ret = request_irq(dev->irq[0], arm_rtc_interrupt, SA_INTERRUPT, | 128 | ret = request_irq(dev->irq[0], arm_rtc_interrupt, IRQF_DISABLED, |
129 | "rtc-pl030", dev); | 129 | "rtc-pl030", dev); |
130 | if (ret) | 130 | if (ret) |
131 | goto map_out; | 131 | goto map_out; |