diff options
-rw-r--r-- | arch/arm/kernel/bios32.c | 2 | ||||
-rw-r--r-- | arch/arm/mm/iomap.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c index f58ba3589908..f3fd52b33e3d 100644 --- a/arch/arm/kernel/bios32.c +++ b/arch/arm/kernel/bios32.c | |||
@@ -525,6 +525,7 @@ void __init pci_common_init(struct hw_pci *hw) | |||
525 | 525 | ||
526 | INIT_LIST_HEAD(&hw->buses); | 526 | INIT_LIST_HEAD(&hw->buses); |
527 | 527 | ||
528 | pci_add_flags(PCI_REASSIGN_ALL_RSRC); | ||
528 | if (hw->preinit) | 529 | if (hw->preinit) |
529 | hw->preinit(); | 530 | hw->preinit(); |
530 | pcibios_init_hw(hw); | 531 | pcibios_init_hw(hw); |
@@ -559,6 +560,7 @@ void __init pci_common_init(struct hw_pci *hw) | |||
559 | pci_bus_add_devices(bus); | 560 | pci_bus_add_devices(bus); |
560 | } | 561 | } |
561 | } | 562 | } |
563 | EXPORT_SYMBOL(pci_flags); | ||
562 | 564 | ||
563 | #ifndef CONFIG_PCI_HOST_ITE8152 | 565 | #ifndef CONFIG_PCI_HOST_ITE8152 |
564 | void pcibios_set_master(struct pci_dev *dev) | 566 | void pcibios_set_master(struct pci_dev *dev) |
diff --git a/arch/arm/mm/iomap.c b/arch/arm/mm/iomap.c index e62956e12030..4614208369f1 100644 --- a/arch/arm/mm/iomap.c +++ b/arch/arm/mm/iomap.c | |||
@@ -32,9 +32,6 @@ EXPORT_SYMBOL(pcibios_min_io); | |||
32 | unsigned long pcibios_min_mem = 0x01000000; | 32 | unsigned long pcibios_min_mem = 0x01000000; |
33 | EXPORT_SYMBOL(pcibios_min_mem); | 33 | EXPORT_SYMBOL(pcibios_min_mem); |
34 | 34 | ||
35 | unsigned int pci_flags = PCI_REASSIGN_ALL_RSRC; | ||
36 | EXPORT_SYMBOL(pci_flags); | ||
37 | |||
38 | void pci_iounmap(struct pci_dev *dev, void __iomem *addr) | 35 | void pci_iounmap(struct pci_dev *dev, void __iomem *addr) |
39 | { | 36 | { |
40 | if ((unsigned long)addr >= VMALLOC_START && | 37 | if ((unsigned long)addr >= VMALLOC_START && |