# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1423  -> 1.1424 
#	arch/ia64/sn/io/machvec/pci_bus_cvlink.c	1.14    -> 1.15   
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/11/06	jbarnes@tomahawk.engr.sgi.com	1.1424
# don't do PCI probing on the simulator
# --------------------------------------------
#
diff -Nru a/arch/ia64/sn/io/machvec/pci_bus_cvlink.c b/arch/ia64/sn/io/machvec/pci_bus_cvlink.c
--- a/arch/ia64/sn/io/machvec/pci_bus_cvlink.c	Thu Nov  6 13:38:56 2003
+++ b/arch/ia64/sn/io/machvec/pci_bus_cvlink.c	Thu Nov  6 13:38:56 2003
@@ -867,8 +867,8 @@
 	int i = 0;
 	struct pci_controller *controller;
 
-	if (!ia64_platform_is("sn2"))
-	    return 0;
+	if (!ia64_platform_is("sn2") || IS_RUNNING_ON_SIMULATOR())
+		return 0;
 
 	/*
 	 * set pci_raw_ops, etc.