diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2011-06-29 10:59:45 -0500 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2011-07-12 11:19:28 -0500 |
| commit | dc8d966bccde0b8b6c9e8c6e663c747030c17435 (patch) | |
| tree | b81db07a29fe9be3472537efc858ad24bea9ba16 /arch/arm/mach-ixp23xx | |
| parent | b480a4b0c81b5e3a5ccc3c045da35d890e80afb4 (diff) | |
| download | linux-stable-dc8d966bccde0b8b6c9e8c6e663c747030c17435.tar.gz linux-stable-dc8d966bccde0b8b6c9e8c6e663c747030c17435.tar.bz2 linux-stable-dc8d966bccde0b8b6c9e8c6e663c747030c17435.zip | |
ARM: pci: make pcibios_assign_all_busses use pci_has_flag
Convert pcibios_assign_all_busses from a define to inline so platforms can
control this setting.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-ixp23xx')
| -rw-r--r-- | arch/arm/mach-ixp23xx/include/mach/hardware.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-ixp23xx/pci.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-ixp23xx/include/mach/hardware.h b/arch/arm/mach-ixp23xx/include/mach/hardware.h index 57b508bfe280..b8bb781e54f0 100644 --- a/arch/arm/mach-ixp23xx/include/mach/hardware.h +++ b/arch/arm/mach-ixp23xx/include/mach/hardware.h @@ -20,8 +20,6 @@ #include "ixp23xx.h" -#define pcibios_assign_all_busses() 0 - /* * Platform helper functions */ diff --git a/arch/arm/mach-ixp23xx/pci.c b/arch/arm/mach-ixp23xx/pci.c index 563819a83292..72d145a2019a 100644 --- a/arch/arm/mach-ixp23xx/pci.c +++ b/arch/arm/mach-ixp23xx/pci.c @@ -227,6 +227,8 @@ static void __init ixp23xx_pci_common_init(void) void __init ixp23xx_pci_preinit(void) { + pci_set_flags(0); + ixp23xx_pci_common_init(); hook_fault_code(16+6, ixp23xx_pci_abort_handler, SIGBUS, 0, |