diff options
| author | Thierry Reding <thierry.reding@avionic-design.de> | 2013-02-11 02:44:47 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-02-16 12:54:24 -0500 |
| commit | 276fd3c5f8a21f9d7d398383b818d5d0ac81db23 (patch) | |
| tree | b71d5672436626530aa44c7a9af091c995bbe92b /arch | |
| parent | bce2bd3cda4e73cd92cf08e017c073058c151ddc (diff) | |
ARM: 7647/1: pci: Keep pci_common_init() around after init
When using deferred driver probing, PCI host controller drivers may
actually require this function after the init stage.
Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/kernel/bios32.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c index 379cf3292390..da7b0c99f296 100644 --- a/arch/arm/kernel/bios32.c +++ b/arch/arm/kernel/bios32.c | |||
| @@ -413,7 +413,7 @@ static int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) | |||
| 413 | return irq; | 413 | return irq; |
| 414 | } | 414 | } |
| 415 | 415 | ||
| 416 | static int __init pcibios_init_resources(int busnr, struct pci_sys_data *sys) | 416 | static int pcibios_init_resources(int busnr, struct pci_sys_data *sys) |
| 417 | { | 417 | { |
| 418 | int ret; | 418 | int ret; |
| 419 | struct pci_host_bridge_window *window; | 419 | struct pci_host_bridge_window *window; |
| @@ -445,7 +445,7 @@ static int __init pcibios_init_resources(int busnr, struct pci_sys_data *sys) | |||
| 445 | return 0; | 445 | return 0; |
| 446 | } | 446 | } |
| 447 | 447 | ||
| 448 | static void __init pcibios_init_hw(struct hw_pci *hw, struct list_head *head) | 448 | static void pcibios_init_hw(struct hw_pci *hw, struct list_head *head) |
| 449 | { | 449 | { |
| 450 | struct pci_sys_data *sys = NULL; | 450 | struct pci_sys_data *sys = NULL; |
| 451 | int ret; | 451 | int ret; |
| @@ -493,7 +493,7 @@ static void __init pcibios_init_hw(struct hw_pci *hw, struct list_head *head) | |||
| 493 | } | 493 | } |
| 494 | } | 494 | } |
| 495 | 495 | ||
| 496 | void __init pci_common_init(struct hw_pci *hw) | 496 | void pci_common_init(struct hw_pci *hw) |
| 497 | { | 497 | { |
| 498 | struct pci_sys_data *sys; | 498 | struct pci_sys_data *sys; |
| 499 | LIST_HEAD(head); | 499 | LIST_HEAD(head); |