diff options
Diffstat (limited to 'arch/powerpc/kernel/rtas_pci.c')
-rw-r--r-- | arch/powerpc/kernel/rtas_pci.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/rtas_pci.c b/arch/powerpc/kernel/rtas_pci.c index 517bd86bc3f..179af906dcd 100644 --- a/arch/powerpc/kernel/rtas_pci.c +++ b/arch/powerpc/kernel/rtas_pci.c | |||
@@ -279,7 +279,7 @@ void __init find_and_init_phbs(void) | |||
279 | eeh_dev_phb_init(); | 279 | eeh_dev_phb_init(); |
280 | 280 | ||
281 | /* | 281 | /* |
282 | * pci_probe_only and pci_assign_all_buses can be set via properties | 282 | * PCI_PROBE_ONLY and PCI_REASSIGN_ALL_BUS can be set via properties |
283 | * in chosen. | 283 | * in chosen. |
284 | */ | 284 | */ |
285 | if (of_chosen) { | 285 | if (of_chosen) { |
@@ -287,8 +287,12 @@ void __init find_and_init_phbs(void) | |||
287 | 287 | ||
288 | prop = of_get_property(of_chosen, | 288 | prop = of_get_property(of_chosen, |
289 | "linux,pci-probe-only", NULL); | 289 | "linux,pci-probe-only", NULL); |
290 | if (prop) | 290 | if (prop) { |
291 | pci_probe_only = *prop; | 291 | if (*prop) |
292 | pci_add_flags(PCI_PROBE_ONLY); | ||
293 | else | ||
294 | pci_clear_flags(PCI_PROBE_ONLY); | ||
295 | } | ||
292 | 296 | ||
293 | #ifdef CONFIG_PPC32 /* Will be made generic soon */ | 297 | #ifdef CONFIG_PPC32 /* Will be made generic soon */ |
294 | prop = of_get_property(of_chosen, | 298 | prop = of_get_property(of_chosen, |