diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2012-02-23 22:18:58 -0500 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-02-23 22:18:58 -0500 |
commit | 673c975624895c4db2edff32601d9c6475b2d39e (patch) | |
tree | d446b54ea15a6706a0ea8fd4c3a856ccd0596da6 /arch/powerpc/platforms/pseries/setup.c | |
parent | 3c13be017abe041e495862d50dbd83093e09cd6a (diff) |
powerpc/PCI: replace pci_probe_only with pci_flags
We already use pci_flags, so this just sets pci_flags directly and removes
the intermediate step of figuring out pci_probe_only, then using it to set
pci_flags.
The PCI core provides a pci_flags definition (currently __weak), so drop
the powerpc definitions in favor of that.
CC: Benjamin Herrenschmidt <benh@kernel.crashing.org>
CC: linuxppc-dev@lists.ozlabs.org
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'arch/powerpc/platforms/pseries/setup.c')
-rw-r--r-- | arch/powerpc/platforms/pseries/setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c index 386e2656c231..fc2a6f60f665 100644 --- a/arch/powerpc/platforms/pseries/setup.c +++ b/arch/powerpc/platforms/pseries/setup.c | |||
@@ -380,8 +380,8 @@ static void __init pSeries_setup_arch(void) | |||
380 | 380 | ||
381 | fwnmi_init(); | 381 | fwnmi_init(); |
382 | 382 | ||
383 | /* By default, only probe PCI (can be overriden by rtas_pci */ | 383 | /* By default, only probe PCI (can be overriden by rtas_pci) */ |
384 | pci_probe_only = 1; | 384 | pci_add_flags(PCI_PROBE_ONLY); |
385 | 385 | ||
386 | /* Find and initialize PCI host bridges */ | 386 | /* Find and initialize PCI host bridges */ |
387 | init_pci_config_tokens(); | 387 | init_pci_config_tokens(); |