diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/ia64/kernel/irq_ia64.c | 2 | ||||
-rw-r--r-- | arch/m68k/atari/stdma.c | 2 | ||||
-rw-r--r-- | arch/ppc/syslib/i8259.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/ia64/kernel/irq_ia64.c b/arch/ia64/kernel/irq_ia64.c index ba3ba8bc50be..456f57b087ca 100644 --- a/arch/ia64/kernel/irq_ia64.c +++ b/arch/ia64/kernel/irq_ia64.c | |||
@@ -275,7 +275,7 @@ static struct irqaction ipi_irqaction = { | |||
275 | 275 | ||
276 | static struct irqaction resched_irqaction = { | 276 | static struct irqaction resched_irqaction = { |
277 | .handler = dummy_handler, | 277 | .handler = dummy_handler, |
278 | .flags = SA_INTERRUPT, | 278 | .flags = IRQF_DISABLED, |
279 | .name = "resched" | 279 | .name = "resched" |
280 | }; | 280 | }; |
281 | #endif | 281 | #endif |
diff --git a/arch/m68k/atari/stdma.c b/arch/m68k/atari/stdma.c index d01deb46ebbc..ab3fd5202b24 100644 --- a/arch/m68k/atari/stdma.c +++ b/arch/m68k/atari/stdma.c | |||
@@ -174,7 +174,7 @@ int stdma_islocked(void) | |||
174 | void __init stdma_init(void) | 174 | void __init stdma_init(void) |
175 | { | 175 | { |
176 | stdma_isr = NULL; | 176 | stdma_isr = NULL; |
177 | request_irq(IRQ_MFP_FDC, stdma_int, IRQ_TYPE_SLOW | SA_SHIRQ, | 177 | request_irq(IRQ_MFP_FDC, stdma_int, IRQ_TYPE_SLOW | IRQF_SHARED, |
178 | "ST-DMA: floppy/ACSI/IDE/Falcon-SCSI", stdma_int); | 178 | "ST-DMA: floppy/ACSI/IDE/Falcon-SCSI", stdma_int); |
179 | } | 179 | } |
180 | 180 | ||
diff --git a/arch/ppc/syslib/i8259.c b/arch/ppc/syslib/i8259.c index a43dda5a8334..1e5a00a4b5f5 100644 --- a/arch/ppc/syslib/i8259.c +++ b/arch/ppc/syslib/i8259.c | |||
@@ -154,7 +154,7 @@ static struct resource pic_edgectrl_iores = { | |||
154 | 154 | ||
155 | static struct irqaction i8259_irqaction = { | 155 | static struct irqaction i8259_irqaction = { |
156 | .handler = no_action, | 156 | .handler = no_action, |
157 | .flags = SA_INTERRUPT, | 157 | .flags = IRQF_DISABLED, |
158 | .mask = CPU_MASK_NONE, | 158 | .mask = CPU_MASK_NONE, |
159 | .name = "82c59 secondary cascade", | 159 | .name = "82c59 secondary cascade", |
160 | }; | 160 | }; |