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/mm/iomap.c | |
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/mm/iomap.c')
-rw-r--r-- | arch/arm/mm/iomap.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mm/iomap.c b/arch/arm/mm/iomap.c index ffad039cbb73..ad41414c0280 100644 --- a/arch/arm/mm/iomap.c +++ b/arch/arm/mm/iomap.c | |||
@@ -8,6 +8,7 @@ | |||
8 | #include <linux/pci.h> | 8 | #include <linux/pci.h> |
9 | #include <linux/ioport.h> | 9 | #include <linux/ioport.h> |
10 | #include <linux/io.h> | 10 | #include <linux/io.h> |
11 | #include <asm/pci.h> | ||
11 | 12 | ||
12 | #ifdef __io | 13 | #ifdef __io |
13 | void __iomem *ioport_map(unsigned long port, unsigned int nr) | 14 | void __iomem *ioport_map(unsigned long port, unsigned int nr) |
@@ -23,6 +24,9 @@ EXPORT_SYMBOL(ioport_unmap); | |||
23 | #endif | 24 | #endif |
24 | 25 | ||
25 | #ifdef CONFIG_PCI | 26 | #ifdef CONFIG_PCI |
27 | unsigned int pci_flags = PCI_REASSIGN_ALL_RSRC; | ||
28 | EXPORT_SYMBOL(pci_flags); | ||
29 | |||
26 | void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen) | 30 | void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen) |
27 | { | 31 | { |
28 | resource_size_t start = pci_resource_start(dev, bar); | 32 | resource_size_t start = pci_resource_start(dev, bar); |