3 files changed, 8 insertions, 8 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)
                                 printk("intr pri %d\n", grrr);
 #endif
                                 if ((bp->irq=irqs[bn]) && valid_irq(bp->irq) &&
-                                    !request_irq(bp->irq|0x30, aurora_interrupt, SA_SHIRQ, "sio16", bp)) {
+                                    !request_irq(bp->irq|0x30, aurora_interrupt, IRQF_SHARED, "sio16", bp)) {
                                         free_irq(bp->irq|0x30, bp);
                                 } else
                                 if ((bp->irq=prom_getint(sdev->prom_node, "bintr")) && valid_irq(bp->irq) &&
-                                    !request_irq(bp->irq|0x30, aurora_interrupt, SA_SHIRQ, "sio16", bp)) {
+                                    !request_irq(bp->irq|0x30, aurora_interrupt, IRQF_SHARED, "sio16", bp)) {
                                         free_irq(bp->irq|0x30, bp);
                                 } else
                                 if ((bp->irq=prom_getint(sdev->prom_node, "intr")) && valid_irq(bp->irq) &&
-                                    !request_irq(bp->irq|0x30, aurora_interrupt, SA_SHIRQ, "sio16", bp)) {
+                                    !request_irq(bp->irq|0x30, aurora_interrupt, IRQF_SHARED, "sio16", bp)) {
                                         free_irq(bp->irq|0x30, bp);
                                 } else
                                 for(grrr=0;grrr<TYPE_1_IRQS;grrr++) {
-                                        if ((bp->irq=type_1_irq[grrr])&&!request_irq(bp->irq|0x30, aurora_interrupt, SA_SHIRQ, "sio16", bp)) {
+                                        if ((bp->irq=type_1_irq[grrr])&&!request_irq(bp->irq|0x30, aurora_interrupt, IRQF_SHARED, "sio16", bp)) {
                                                 free_irq(bp->irq|0x30, bp);
                                                 break;
                                         } else {
@@ -909,14 +909,14 @@ static int aurora_setup_board(struct Aurora_board * bp)
 #ifdef AURORA_ALLIRQ
         int i;
         for (i = 0; i < AURORA_ALLIRQ; i++) {
-                error = request_irq(allirq[i]|0x30, aurora_interrupt, SA_SHIRQ,
+                error = request_irq(allirq[i]|0x30, aurora_interrupt, IRQF_SHARED,
                                     "sio16", bp);
                 if (error)
                         printk(KERN_ERR "IRQ%d request error %d\n",
                                allirq[i], error);
         }
 #else
-        error = request_irq(bp->irq|0x30, aurora_interrupt, SA_SHIRQ,
+        error = request_irq(bp->irq|0x30, aurora_interrupt, IRQF_SHARED,
                             "sio16", bp);
         if (error) {
                 printk(KERN_ERR "IRQ request error %d\n", error);
diff --git a/drivers/sbus/char/bbc_i2c.c b/drivers/sbus/char/bbc_i2c.c
index 73634371393b..7186235594f9 100644
--- a/drivers/sbus/char/bbc_i2c.c
+++ b/drivers/sbus/char/bbc_i2c.c
@@ -377,7 +377,7 @@ static int __init attach_one_i2c(struct linux_ebus_device *edev, int index)
         bp->waiting = 0;
         init_waitqueue_head(&bp->wq);
         if (request_irq(edev->irqs[0], bbc_i2c_interrupt,
-                        SA_SHIRQ, "bbc_i2c", bp))
+                        IRQF_SHARED, "bbc_i2c", bp))
                 goto fail;
 
         bp->index = index;
diff --git a/drivers/sbus/char/cpwatchdog.c b/drivers/sbus/char/cpwatchdog.c
index 21737b7e86a1..836a58bb0305 100644
--- a/drivers/sbus/char/cpwatchdog.c
+++ b/drivers/sbus/char/cpwatchdog.c
@@ -301,7 +301,7 @@ static int wd_open(struct inode *inode, struct file *f)
         {       
                 if (request_irq(wd_dev.irq, 
                                                 &wd_interrupt, 
-                                                SA_SHIRQ,
+                                                IRQF_SHARED,
                                                 WD_OBPNAME,
                                                 (void *)wd_dev.regs)) {
                         printk("%s: Cannot register IRQ %d\n",