]> git.hungrycats.org Git - linux/commitdiff
[PATCH] sn: Simulator check in pci_bus_cvlink.c
authorAndrew Morton <akpm@osdl.org>
Mon, 19 Jan 2004 02:53:51 +0000 (18:53 -0800)
committerLinus Torvalds <torvalds@home.osdl.org>
Mon, 19 Jan 2004 02:53:51 +0000 (18:53 -0800)
From: Pat Gefre <pfg@sgi.com>

Simulator check in pci_bus_cvlink.c

arch/ia64/sn/io/machvec/pci_bus_cvlink.c

index 08410c54a9d6efde2201468bd365bdf5ee2d4036..b094af31f6cff9928cc5cfa173020a63e6795618 100644 (file)
@@ -11,6 +11,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;
 
@@ -801,8 +802,8 @@ sn_pci_init (void)
        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.