diff options
Diffstat (limited to 'arch/arm/kernel/bios32.c')
-rw-r--r-- | arch/arm/kernel/bios32.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c index b2ed73c45489..261fcc826169 100644 --- a/arch/arm/kernel/bios32.c +++ b/arch/arm/kernel/bios32.c | |||
@@ -445,7 +445,8 @@ static int pcibios_init_resources(int busnr, struct pci_sys_data *sys) | |||
445 | return 0; | 445 | return 0; |
446 | } | 446 | } |
447 | 447 | ||
448 | static void pcibios_init_hw(struct hw_pci *hw, struct list_head *head) | 448 | static void pcibios_init_hw(struct device *parent, struct hw_pci *hw, |
449 | struct list_head *head) | ||
449 | { | 450 | { |
450 | struct pci_sys_data *sys = NULL; | 451 | struct pci_sys_data *sys = NULL; |
451 | int ret; | 452 | int ret; |
@@ -480,7 +481,7 @@ static void pcibios_init_hw(struct hw_pci *hw, struct list_head *head) | |||
480 | if (hw->scan) | 481 | if (hw->scan) |
481 | sys->bus = hw->scan(nr, sys); | 482 | sys->bus = hw->scan(nr, sys); |
482 | else | 483 | else |
483 | sys->bus = pci_scan_root_bus(NULL, sys->busnr, | 484 | sys->bus = pci_scan_root_bus(parent, sys->busnr, |
484 | hw->ops, sys, &sys->resources); | 485 | hw->ops, sys, &sys->resources); |
485 | 486 | ||
486 | if (!sys->bus) | 487 | if (!sys->bus) |
@@ -497,7 +498,7 @@ static void pcibios_init_hw(struct hw_pci *hw, struct list_head *head) | |||
497 | } | 498 | } |
498 | } | 499 | } |
499 | 500 | ||
500 | void pci_common_init(struct hw_pci *hw) | 501 | void pci_common_init_dev(struct device *parent, struct hw_pci *hw) |
501 | { | 502 | { |
502 | struct pci_sys_data *sys; | 503 | struct pci_sys_data *sys; |
503 | LIST_HEAD(head); | 504 | LIST_HEAD(head); |
@@ -505,7 +506,7 @@ void pci_common_init(struct hw_pci *hw) | |||
505 | pci_add_flags(PCI_REASSIGN_ALL_RSRC); | 506 | pci_add_flags(PCI_REASSIGN_ALL_RSRC); |
506 | if (hw->preinit) | 507 | if (hw->preinit) |
507 | hw->preinit(); | 508 | hw->preinit(); |
508 | pcibios_init_hw(hw, &head); | 509 | pcibios_init_hw(parent, hw, &head); |
509 | if (hw->postinit) | 510 | if (hw->postinit) |
510 | hw->postinit(); | 511 | hw->postinit(); |
511 | 512 | ||