--- zzzz-none-000/linux-2.6.19.2/drivers/infiniband/hw/ipath/ipath_intr.c	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5505/linux-2.6.19.2/drivers/infiniband/hw/ipath/ipath_intr.c	2007-01-11 07:38:19.000000000 +0000
@@ -710,14 +710,14 @@
 			 * linuxbios development work, and it may happen in
 			 * the future again.
 			 */
-			if (dd->pcidev && dd->ipath_irq) {
+			if (dd->pcidev && dd->pcidev->irq) {
 				ipath_dev_err(dd, "Now %u unexpected "
 					      "interrupts, unregistering "
 					      "interrupt handler\n",
 					      *unexpectp);
-				ipath_dbg("free_irq of irq %d\n",
-					  dd->ipath_irq);
-				dd->ipath_f_free_irq(dd);
+				ipath_dbg("free_irq of irq %x\n",
+					  dd->pcidev->irq);
+				free_irq(dd->pcidev->irq, dd);
 			}
 		}
 		if (ipath_read_kreg32(dd, dd->ipath_kregs->kr_intmask)) {
@@ -753,7 +753,7 @@
 		if (allbits == 2) {
 			ipath_dev_err(dd, "Still bad interrupt status, "
 				      "unregistering interrupt\n");
-			dd->ipath_f_free_irq(dd);
+			free_irq(dd->pcidev->irq, dd);
 		} else if (allbits > 2) {
 			if ((allbits % 10000) == 0)
 				printk(".");