diff options
Diffstat (limited to 'arch/powerpc/kernel')
-rw-r--r-- | arch/powerpc/kernel/pci_64.c | 2 | ||||
-rw-r--r-- | arch/powerpc/kernel/rtas_pci.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c index 30a4e6a1368a..74dc76653e1b 100644 --- a/arch/powerpc/kernel/pci_64.c +++ b/arch/powerpc/kernel/pci_64.c | |||
@@ -388,7 +388,7 @@ struct pci_dev *of_create_pci_dev(struct device_node *node, | |||
388 | 388 | ||
389 | dev->current_state = 4; /* unknown power state */ | 389 | dev->current_state = 4; /* unknown power state */ |
390 | 390 | ||
391 | if (!strcmp(type, "pci")) { | 391 | if (!strcmp(type, "pci") || !strcmp(type, "pciex")) { |
392 | /* a PCI-PCI bridge */ | 392 | /* a PCI-PCI bridge */ |
393 | dev->hdr_type = PCI_HEADER_TYPE_BRIDGE; | 393 | dev->hdr_type = PCI_HEADER_TYPE_BRIDGE; |
394 | dev->rom_base_reg = PCI_ROM_ADDRESS1; | 394 | dev->rom_base_reg = PCI_ROM_ADDRESS1; |
diff --git a/arch/powerpc/kernel/rtas_pci.c b/arch/powerpc/kernel/rtas_pci.c index 57b539a03fa9..6eb7e49b394a 100644 --- a/arch/powerpc/kernel/rtas_pci.c +++ b/arch/powerpc/kernel/rtas_pci.c | |||
@@ -313,7 +313,9 @@ unsigned long __init find_and_init_phbs(void) | |||
313 | for (node = of_get_next_child(root, NULL); | 313 | for (node = of_get_next_child(root, NULL); |
314 | node != NULL; | 314 | node != NULL; |
315 | node = of_get_next_child(root, node)) { | 315 | node = of_get_next_child(root, node)) { |
316 | if (node->type == NULL || strcmp(node->type, "pci") != 0) | 316 | |
317 | if (node->type == NULL || (strcmp(node->type, "pci") != 0 && | ||
318 | strcmp(node->type, "pciex") != 0)) | ||
317 | continue; | 319 | continue; |
318 | 320 | ||
319 | phb = pcibios_alloc_controller(node); | 321 | phb = pcibios_alloc_controller(node); |