Index: kernel/genarch/include/ofw/ofw_tree.h
===================================================================
--- kernel/genarch/include/ofw/ofw_tree.h	(revision 233af8c563ae6dbff256dbcf9920cbce40be88d0)
+++ kernel/genarch/include/ofw/ofw_tree.h	(revision 8ce84991b196fbdd0b7d639a36b146cf784f38fb)
@@ -116,5 +116,5 @@
 	uint32_t intr;
 	uint32_t controller_handle;
-	uint32_t controller_inr;
+	uint32_t controller_ino;
 } __attribute__ ((packed));
 typedef struct ofw_ebus_intr_map ofw_ebus_intr_map_t;
@@ -166,6 +166,7 @@
 extern bool ofw_pci_reg_absolutize(ofw_tree_node_t *node, ofw_pci_reg_t *reg, ofw_pci_reg_t *out);
 
-extern bool ofw_fhc_map_interrupts(ofw_tree_node_t *node, ofw_fhc_reg_t *reg, uint32_t interrupt, int *inr);
-extern bool ofw_ebus_map_interrupts(ofw_tree_node_t *node, ofw_ebus_reg_t *reg, uint32_t interrupt, int *inr);
+extern bool ofw_fhc_map_interrupt(ofw_tree_node_t *node, ofw_fhc_reg_t *reg, uint32_t interrupt, int *inr);
+extern bool ofw_ebus_map_interrupt(ofw_tree_node_t *node, ofw_ebus_reg_t *reg, uint32_t interrupt, int *inr);
+extern bool ofw_pci_map_interrupt(ofw_tree_node_t *node, ofw_pci_reg_t *reg, int ino, int *inr);
 
 #endif