X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fpnp%2Fresource.c;h=3fc9f6c6fddb1d5ae2c7285632377160877b951b;hb=9e1bf581d67d87a1d7fc0ea500729e3a03643a26;hp=80a6979ef5186f85943e6593f37198133d296ddf;hpb=8d40237c730b8be87c1b80a5d96b9c603fefa829;p=linux-2.6.git

diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
index 80a6979ef..3fc9f6c6f 100644
--- a/drivers/pnp/resource.c
+++ b/drivers/pnp/resource.c
@@ -101,8 +101,8 @@ int pnp_register_irq_resource(struct pnp_option *option, struct pnp_irq *data)
 	{
 		int i;
 
-		for (i = 0; i < 16; i++)
-			if (test_bit(i, data->map))
+		for (i=0; i<16; i++)
+			if (data->map & (1<<i))
 				pcibios_penalize_isa_irq(i);
 	}
 #endif
@@ -421,7 +421,6 @@ int pnp_check_irq(struct pnp_dev * dev, int idx)
 
 int pnp_check_dma(struct pnp_dev * dev, int idx)
 {
-#ifndef CONFIG_IA64
 	int tmp;
 	struct pnp_dev *tdev;
 	unsigned long * dma = &dev->res.dma_resource[idx].start;
@@ -471,10 +470,6 @@ int pnp_check_dma(struct pnp_dev * dev, int idx)
 	}
 
 	return 1;
-#else
-	/* IA64 hasn't legacy DMA */
-	return 0;
-#endif
 }