diff options
author | Rob Herring <rob.herring@calxeda.com> | 2011-06-29 11:59:45 -0400 |
---|---|---|
committer | Rob Herring <rob.herring@calxeda.com> | 2011-07-12 12:19:28 -0400 |
commit | dc8d966bccde0b8b6c9e8c6e663c747030c17435 (patch) | |
tree | b81db07a29fe9be3472537efc858ad24bea9ba16 /arch/arm/mach-ixp2000 | |
parent | b480a4b0c81b5e3a5ccc3c045da35d890e80afb4 (diff) |
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-ixp2000')
-rw-r--r-- | arch/arm/mach-ixp2000/include/mach/hardware.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-ixp2000/pci.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-ixp2000/include/mach/hardware.h b/arch/arm/mach-ixp2000/include/mach/hardware.h index f033de4e7493..6c92008aff45 100644 --- a/arch/arm/mach-ixp2000/include/mach/hardware.h +++ b/arch/arm/mach-ixp2000/include/mach/hardware.h | |||
@@ -27,8 +27,6 @@ | |||
27 | 27 | ||
28 | #include "ixp2000-regs.h" /* Chipset Registers */ | 28 | #include "ixp2000-regs.h" /* Chipset Registers */ |
29 | 29 | ||
30 | #define pcibios_assign_all_busses() 0 | ||
31 | |||
32 | /* | 30 | /* |
33 | * Platform helper functions | 31 | * Platform helper functions |
34 | */ | 32 | */ |
diff --git a/arch/arm/mach-ixp2000/pci.c b/arch/arm/mach-ixp2000/pci.c index f797c5f538b0..8888ed9429f8 100644 --- a/arch/arm/mach-ixp2000/pci.c +++ b/arch/arm/mach-ixp2000/pci.c | |||
@@ -196,6 +196,8 @@ clear_master_aborts(void) | |||
196 | void __init | 196 | void __init |
197 | ixp2000_pci_preinit(void) | 197 | ixp2000_pci_preinit(void) |
198 | { | 198 | { |
199 | pci_set_flags(0); | ||
200 | |||
199 | #ifndef CONFIG_IXP2000_SUPPORT_BROKEN_PCI_IO | 201 | #ifndef CONFIG_IXP2000_SUPPORT_BROKEN_PCI_IO |
200 | /* | 202 | /* |
201 | * Configure the PCI unit to properly byteswap I/O transactions, | 203 | * Configure the PCI unit to properly byteswap I/O transactions, |