diff options
Diffstat (limited to 'drivers/sbus/char/aurora.c')
-rw-r--r-- | drivers/sbus/char/aurora.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/sbus/char/aurora.c b/drivers/sbus/char/aurora.c index 015db40ad8a4..4fdb2c932210 100644 --- a/drivers/sbus/char/aurora.c +++ b/drivers/sbus/char/aurora.c | |||
@@ -337,19 +337,19 @@ static int aurora_probe(void) | |||
337 | printk("intr pri %d\n", grrr); | 337 | printk("intr pri %d\n", grrr); |
338 | #endif | 338 | #endif |
339 | if ((bp->irq=irqs[bn]) && valid_irq(bp->irq) && | 339 | if ((bp->irq=irqs[bn]) && valid_irq(bp->irq) && |
340 | !request_irq(bp->irq|0x30, aurora_interrupt, SA_SHIRQ, "sio16", bp)) { | 340 | !request_irq(bp->irq|0x30, aurora_interrupt, IRQF_SHARED, "sio16", bp)) { |
341 | free_irq(bp->irq|0x30, bp); | 341 | free_irq(bp->irq|0x30, bp); |
342 | } else | 342 | } else |
343 | if ((bp->irq=prom_getint(sdev->prom_node, "bintr")) && valid_irq(bp->irq) && | 343 | if ((bp->irq=prom_getint(sdev->prom_node, "bintr")) && valid_irq(bp->irq) && |
344 | !request_irq(bp->irq|0x30, aurora_interrupt, SA_SHIRQ, "sio16", bp)) { | 344 | !request_irq(bp->irq|0x30, aurora_interrupt, IRQF_SHARED, "sio16", bp)) { |
345 | free_irq(bp->irq|0x30, bp); | 345 | free_irq(bp->irq|0x30, bp); |
346 | } else | 346 | } else |
347 | if ((bp->irq=prom_getint(sdev->prom_node, "intr")) && valid_irq(bp->irq) && | 347 | if ((bp->irq=prom_getint(sdev->prom_node, "intr")) && valid_irq(bp->irq) && |
348 | !request_irq(bp->irq|0x30, aurora_interrupt, SA_SHIRQ, "sio16", bp)) { | 348 | !request_irq(bp->irq|0x30, aurora_interrupt, IRQF_SHARED, "sio16", bp)) { |
349 | free_irq(bp->irq|0x30, bp); | 349 | free_irq(bp->irq|0x30, bp); |
350 | } else | 350 | } else |
351 | for(grrr=0;grrr<TYPE_1_IRQS;grrr++) { | 351 | for(grrr=0;grrr<TYPE_1_IRQS;grrr++) { |
352 | if ((bp->irq=type_1_irq[grrr])&&!request_irq(bp->irq|0x30, aurora_interrupt, SA_SHIRQ, "sio16", bp)) { | 352 | if ((bp->irq=type_1_irq[grrr])&&!request_irq(bp->irq|0x30, aurora_interrupt, IRQF_SHARED, "sio16", bp)) { |
353 | free_irq(bp->irq|0x30, bp); | 353 | free_irq(bp->irq|0x30, bp); |
354 | break; | 354 | break; |
355 | } else { | 355 | } else { |
@@ -909,14 +909,14 @@ static int aurora_setup_board(struct Aurora_board * bp) | |||
909 | #ifdef AURORA_ALLIRQ | 909 | #ifdef AURORA_ALLIRQ |
910 | int i; | 910 | int i; |
911 | for (i = 0; i < AURORA_ALLIRQ; i++) { | 911 | for (i = 0; i < AURORA_ALLIRQ; i++) { |
912 | error = request_irq(allirq[i]|0x30, aurora_interrupt, SA_SHIRQ, | 912 | error = request_irq(allirq[i]|0x30, aurora_interrupt, IRQF_SHARED, |
913 | "sio16", bp); | 913 | "sio16", bp); |
914 | if (error) | 914 | if (error) |
915 | printk(KERN_ERR "IRQ%d request error %d\n", | 915 | printk(KERN_ERR "IRQ%d request error %d\n", |
916 | allirq[i], error); | 916 | allirq[i], error); |
917 | } | 917 | } |
918 | #else | 918 | #else |
919 | error = request_irq(bp->irq|0x30, aurora_interrupt, SA_SHIRQ, | 919 | error = request_irq(bp->irq|0x30, aurora_interrupt, IRQF_SHARED, |
920 | "sio16", bp); | 920 | "sio16", bp); |
921 | if (error) { | 921 | if (error) { |
922 | printk(KERN_ERR "IRQ request error %d\n", error); | 922 | printk(KERN_ERR "IRQ request error %d\n", error); |