[S390] cio: add timeout handler for internal operations.

[linux-2.6-omap-h63xx.git] / drivers / pnp / resource.c

diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
index 9fefe563f8fc5bf27ee1a66c23fef4a65ef3be74..5c8ec21e1086c71a0440508f6774098d9a504a35 100644 (file)
--- a/drivers/pnp/resource.c
+++ b/drivers/pnp/resource.c
@@ -396,7 +396,7 @@ int pnp_check_irq(struct pnp_dev * dev, int idx)
         * device is active because it itself may be in use */
        if(!dev->active) {
                if (request_irq(*irq, pnp_test_handler,
-                               SA_INTERRUPT|SA_PROBEIRQ, "pnp", NULL))
+                               IRQF_DISABLED|IRQF_PROBE_SHARED, "pnp", NULL))
                        return 0;
                free_irq(*irq, NULL);
        }