Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / arch / powerpc / sysdev / fsl_pci.c

diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c
index c5077673bd9433633be839cc58c02bfc6137d29c..65d2ed4549e667ec981f272d88ff12fc234e9fd9 100644 (file)
--- a/arch/powerpc/sysdev/fsl_pci.c
+++ b/arch/powerpc/sysdev/fsl_pci.c
@@ -522,7 +522,8 @@ int fsl_add_bridge(struct platform_device *pdev, int is_primary)
        } else {
                /* For PCI read PROG to identify controller mode */
                early_read_config_byte(hose, 0, 0, PCI_CLASS_PROG, &progif);
-               if ((progif & 1) == 1)
+               if ((progif & 1) &&
+                   !of_property_read_bool(dev, "fsl,pci-agent-force-enum"))
                        goto no_bridge;
        }