PERFORCE change 107648 for review

[Paolo Pisati]

http://perforce.freebsd.org/chv.cgi?CH=107648

Change 107648 by piso at piso_newluxor on 2006/10/10 23:11:00

	Compilation

Affected files ...

.. //depot/projects/soc2006/intr_filter/dev/ipmi/ipmi.c#3 edit
.. //depot/projects/soc2006/intr_filter/pci/intpm.c#4 edit

Differences ...

==== //depot/projects/soc2006/intr_filter/dev/ipmi/ipmi.c#3 (text) ====

@@ -850,7 +850,7 @@
 
 	if (sc->ipmi_irq_res != NULL && sc->ipmi_intr != NULL) {
 		error = bus_setup_intr(dev, sc->ipmi_irq_res, INTR_TYPE_MISC,
-		    sc->ipmi_intr, sc, &sc->ipmi_irq);
+		    NULL, sc->ipmi_intr, sc, &sc->ipmi_irq);
 		if (error) {
 			device_printf(dev, "can't set up interrupt\n");
 			return (error);

==== //depot/projects/soc2006/intr_filter/pci/intpm.c#4 (text+ko) ====

@@ -746,8 +746,7 @@
 		device_printf(dev, "could not allocate irq");
 		return (ENOMEM);
 	}
-	error = bus_setup_intr(dev, res, INTR_TYPE_MISC, intpm_intr, sc, &ih);
-	error=bus_setup_intr(dev, res, INTR_TYPE_MISC, NULL, (driver_intr_t *) intpm_intr,sciic, &ih);
+	error = bus_setup_intr(dev, res, INTR_TYPE_MISC, NULL, intpm_intr, sc, &ih);
 	if (error) {
 		device_printf(dev, "Failed to map intr\n");
 		return (error);