4 files changed, 6 insertions, 4 deletions

diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c
index 3a8f1b427a7f..7ad479e4e3b3 100644
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
@@ -78,7 +78,7 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)
                 int irq = IRQ_GPIO(pdata->buttons[i].gpio);
 
                 set_irq_type(irq, IRQ_TYPE_EDGE_BOTH);
-                error = request_irq(irq, gpio_keys_isr, SA_SAMPLE_RANDOM,
+                error = request_irq(irq, gpio_keys_isr, IRQF_SAMPLE_RANDOM,
                                      pdata->buttons[i].desc ? pdata->buttons[i].desc : "gpio_keys",
                                      pdev);
                 if (error) {
diff --git a/drivers/mtd/nand/cafe.c b/drivers/mtd/nand/cafe.c
index 65f9bd3ceebf..08cb060dfa3d 100644
--- a/drivers/mtd/nand/cafe.c
+++ b/drivers/mtd/nand/cafe.c
@@ -597,7 +597,8 @@ static int __devinit cafe_nand_probe(struct pci_dev *pdev,
                 cafe_writel(cafe, 0xffffffff, NAND_TIMING3);
         }
         cafe_writel(cafe, 0xffffffff, NAND_IRQ_MASK);
-        err = request_irq(pdev->irq, &cafe_nand_interrupt, SA_SHIRQ, "CAFE NAND", mtd);
+        err = request_irq(pdev->irq, &cafe_nand_interrupt, IRQF_SHARED,
+                          "CAFE NAND", mtd);
         if (err) {
                 dev_warn(&pdev->dev, "Could not register IRQ %d\n", pdev->irq);
 
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c
index c67f7d3c2f92..43583ed655ab 100644
--- a/drivers/net/cxgb3/cxgb3_main.c
+++ b/drivers/net/cxgb3/cxgb3_main.c
@@ -757,7 +757,8 @@ static int cxgb_up(struct adapter *adap)
                                       t3_intr_handler(adap,
                                                       adap->sge.qs[0].rspq.
                                                       polling),
-                                      (adap->flags & USING_MSI) ? 0 : SA_SHIRQ,
+                                      (adap->flags & USING_MSI) ?
+                                       0 : IRQF_SHARED,
                                       adap->name, adap)))
                 goto irq_err;
 
diff --git a/drivers/net/sc92031.c b/drivers/net/sc92031.c
index 7f800feaa9a2..4a926f20b6ea 100644
--- a/drivers/net/sc92031.c
+++ b/drivers/net/sc92031.c
@@ -1035,7 +1035,7 @@ static int sc92031_open(struct net_device *dev)
         priv->tx_head = priv->tx_tail = 0;
 
         err = request_irq(pdev->irq, sc92031_interrupt,
-                        SA_SHIRQ, dev->name, dev);
+                        IRQF_SHARED, dev->name, dev);
         if (unlikely(err < 0))
                 goto out_request_irq;