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 6cd8f0196b6..140735c18c3 100644 --- a/arch/powerpc/kernel/rtas_pci.c +++ b/arch/powerpc/kernel/rtas_pci.c | |||
@@ -276,7 +276,7 @@ void __init find_and_init_phbs(void) | |||
276 | pci_devs_phb_init(); | 276 | pci_devs_phb_init(); |
277 | 277 | ||
278 | /* | 278 | /* |
279 | * pci_probe_only and pci_assign_all_buses can be set via properties | 279 | * PCI_PROBE_ONLY and PCI_REASSIGN_ALL_BUS can be set via properties |
280 | * in chosen. | 280 | * in chosen. |
281 | */ | 281 | */ |
282 | if (of_chosen) { | 282 | if (of_chosen) { |
@@ -284,8 +284,12 @@ void __init find_and_init_phbs(void) | |||
284 | 284 | ||
285 | prop = of_get_property(of_chosen, | 285 | prop = of_get_property(of_chosen, |
286 | "linux,pci-probe-only", NULL); | 286 | "linux,pci-probe-only", NULL); |
287 | if (prop) | 287 | if (prop) { |
288 | pci_probe_only = *prop; | 288 | if (*prop) |
289 | pci_add_flags(PCI_PROBE_ONLY); | ||
290 | else | ||
291 | pci_clear_flags(PCI_PROBE_ONLY); | ||
292 | } | ||
289 | 293 | ||
290 | #ifdef CONFIG_PPC32 /* Will be made generic soon */ | 294 | #ifdef CONFIG_PPC32 /* Will be made generic soon */ |
291 | prop = of_get_property(of_chosen, | 295 | prop = of_get_property(of_chosen, |