diff options
Diffstat (limited to 'arch/arm/plat-omap')
-rw-r--r-- | arch/arm/plat-omap/dma.c | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/pm.c | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/timer32k.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c index c2c05ef86348..9eddc9507147 100644 --- a/arch/arm/plat-omap/dma.c +++ b/arch/arm/plat-omap/dma.c | |||
@@ -939,7 +939,7 @@ static irqreturn_t omap2_dma_irq_handler(int irq, void *dev_id, | |||
939 | static struct irqaction omap24xx_dma_irq = { | 939 | static struct irqaction omap24xx_dma_irq = { |
940 | .name = "DMA", | 940 | .name = "DMA", |
941 | .handler = omap2_dma_irq_handler, | 941 | .handler = omap2_dma_irq_handler, |
942 | .flags = SA_INTERRUPT | 942 | .flags = IRQF_DISABLED |
943 | }; | 943 | }; |
944 | 944 | ||
945 | #else | 945 | #else |
diff --git a/arch/arm/plat-omap/pm.c b/arch/arm/plat-omap/pm.c index 1a24e2c10714..04b4102727a8 100644 --- a/arch/arm/plat-omap/pm.c +++ b/arch/arm/plat-omap/pm.c | |||
@@ -580,7 +580,7 @@ static irqreturn_t omap_wakeup_interrupt(int irq, void * dev, | |||
580 | 580 | ||
581 | static struct irqaction omap_wakeup_irq = { | 581 | static struct irqaction omap_wakeup_irq = { |
582 | .name = "peripheral wakeup", | 582 | .name = "peripheral wakeup", |
583 | .flags = SA_INTERRUPT, | 583 | .flags = IRQF_DISABLED, |
584 | .handler = omap_wakeup_interrupt | 584 | .handler = omap_wakeup_interrupt |
585 | }; | 585 | }; |
586 | 586 | ||
diff --git a/arch/arm/plat-omap/timer32k.c b/arch/arm/plat-omap/timer32k.c index ddf4360dea72..281ecc7fcdfc 100644 --- a/arch/arm/plat-omap/timer32k.c +++ b/arch/arm/plat-omap/timer32k.c | |||
@@ -258,7 +258,7 @@ static struct dyn_tick_timer omap_dyn_tick_timer = { | |||
258 | 258 | ||
259 | static struct irqaction omap_32k_timer_irq = { | 259 | static struct irqaction omap_32k_timer_irq = { |
260 | .name = "32KHz timer", | 260 | .name = "32KHz timer", |
261 | .flags = SA_INTERRUPT | SA_TIMER, | 261 | .flags = IRQF_DISABLED | IRQF_TIMER, |
262 | .handler = omap_32k_timer_interrupt, | 262 | .handler = omap_32k_timer_interrupt, |
263 | }; | 263 | }; |
264 | 264 | ||