diff -Naurp -X /home/jbarnes/dontdiff 130-tio-and-sn2-update.patch/arch/ia64/sn/io/machvec/pci_bus_cvlink.c 140-sn2-pci-fixes.patch/arch/ia64/sn/io/machvec/pci_bus_cvlink.c
--- 130-tio-and-sn2-update.patch/arch/ia64/sn/io/machvec/pci_bus_cvlink.c	Tue Dec 30 16:39:37 2003
+++ 140-sn2-pci-fixes.patch/arch/ia64/sn/io/machvec/pci_bus_cvlink.c	Tue Dec 30 16:39:42 2003
@@ -10,6 +10,7 @@
 #include <asm/sn/iograph.h>
 #include <asm/sn/pci/pci_bus_cvlink.h>
 #include <asm/sn/sn_cpuid.h>
+#include <asm/sn/simulator.h>
 
 extern int bridge_rev_b_data_check_disable;
 
@@ -356,7 +357,6 @@ sn_pci_fixup(int arg)
 	int cpuid;
 	vertex_hdl_t device_vertex;
 	pciio_intr_line_t lines;
-	extern void sn_pci_find_bios(void);
 	extern int numnodes;
 	int cnode;
 
@@ -365,8 +365,9 @@ sn_pci_fixup(int arg)
 		extern void register_sn_procfs(void);
 #endif
 		extern void sn_init_cpei_timer(void);
+		extern void sgi_master_io_infr_init(void);
 
-		sn_pci_find_bios();
+		sgi_master_io_infr_init();
 		for (cnode = 0; cnode < numnodes; cnode++) {
 			extern void intr_init_vecblk(cnodeid_t);
 			intr_init_vecblk(cnode);