PCI: Let PCI_MULTITHREAD_PROBE depend on BROKEN

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

diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
index 9fefe563f8fc5bf27ee1a66c23fef4a65ef3be74..a685fbec4604e861bdb004ff10bacf95befbaf7f 100644 (file)
--- a/drivers/pnp/resource.c
+++ b/drivers/pnp/resource.c
@@ -348,7 +348,7 @@ int pnp_check_mem(struct pnp_dev * dev, int idx)
        return 1;
 }
 
-static irqreturn_t pnp_test_handler(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t pnp_test_handler(int irq, void *dev_id)
 {
        return IRQ_HANDLED;
 }
@@ -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);
        }