summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/powermac
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2012-02-24 04:18:58 +0100
committerBjorn Helgaas <bhelgaas@google.com>2012-02-24 04:18:58 +0100
commit3c13be017abe041e495862d50dbd83093e09cd6a (patch)
tree54f430a5df0d835950430b7199633cc578041c32 /arch/powerpc/platforms/powermac
parentmips/PCI: removed unused pci_probe configurability (diff)
downloadlinux-3c13be017abe041e495862d50dbd83093e09cd6a.tar.xz
linux-3c13be017abe041e495862d50dbd83093e09cd6a.zip
powerpc/PCI: make pci_probe_only default to 0
pci_probe_only is set on ppc64 to prevent resource re-allocation by the core. It's meant to be used in very specific circumstances such as when operating under a hypervisor that may prevent such re-allocation. Instead of default to 1, we make it default to 0 and explicitly set it in the few cases where we need it. This fixes FSL PCI which wants it clear among others. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'arch/powerpc/platforms/powermac')
-rw-r--r--arch/powerpc/platforms/powermac/pci.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c
index 31a7d3a7ce25..43bbe1bda939 100644
--- a/arch/powerpc/platforms/powermac/pci.c
+++ b/arch/powerpc/platforms/powermac/pci.c
@@ -1059,9 +1059,6 @@ void __init pmac_pci_init(void)
}
/* pmac_check_ht_link(); */
- /* We can allocate missing resources if any */
- pci_probe_only = 0;
-
#else /* CONFIG_PPC64 */
init_p2pbridge();
init_second_ohare();