Merge tag 'trace-seq-buf-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...

[cascardo/linux.git] / drivers / edac / mv64x60_edac.c

diff --git a/drivers/edac/mv64x60_edac.c b/drivers/edac/mv64x60_edac.c
index 542fad7..6366e88 100644 (file)
--- a/drivers/edac/mv64x60_edac.c
+++ b/drivers/edac/mv64x60_edac.c
@@ -178,7 +178,7 @@ static int mv64x60_pci_err_probe(struct platform_device *pdev)
                res = devm_request_irq(&pdev->dev,
                                       pdata->irq,
                                       mv64x60_pci_isr,
-                                      IRQF_DISABLED,
+                                      0,
                                       "[EDAC] PCI err",
                                       pci);
                if (res < 0) {
@@ -345,7 +345,7 @@ static int mv64x60_sram_err_probe(struct platform_device *pdev)
                res = devm_request_irq(&pdev->dev,
                                       pdata->irq,
                                       mv64x60_sram_isr,
-                                      IRQF_DISABLED,
+                                      0,
                                       "[EDAC] SRAM err",
                                       edac_dev);
                if (res < 0) {
@@ -540,7 +540,7 @@ static int mv64x60_cpu_err_probe(struct platform_device *pdev)
                res = devm_request_irq(&pdev->dev,
                                       pdata->irq,
                                       mv64x60_cpu_isr,
-                                      IRQF_DISABLED,
+                                      0,
                                       "[EDAC] CPU err",
                                       edac_dev);
                if (res < 0) {
@@ -800,7 +800,7 @@ static int mv64x60_mc_err_probe(struct platform_device *pdev)
                res = devm_request_irq(&pdev->dev,
                                       pdata->irq,
                                       mv64x60_mc_isr,
-                                      IRQF_DISABLED,
+                                      0,
                                       "[EDAC] MC err",
                                       mci);
                if (res < 0) {