diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2017-09-07 13:24:19 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-09-07 13:24:19 -0500 |
| commit | 9198407e23ec89f0e1562f439771aeea83345d0d (patch) | |
| tree | c6a53b71b48c49d7713539eb035e7b2fcec69d2a /arch/microblaze/include/asm/pci.h | |
| parent | d872694bac212f76ca13fd20a85e5c1bdb53a945 (diff) | |
| parent | c775697b713b70293507573355aa8c8c177db35b (diff) | |
Merge branch 'pci/resource' into next
* pci/resource:
microblaze/PCI: Remove pcibios_setup_bus_{self/devices} dead code
ARC: Remove empty kernel/pcibios.c
PCI: Add a generic weak pcibios_align_resource()
PCI: Add a generic weak pcibios_fixup_bus()
Diffstat (limited to 'arch/microblaze/include/asm/pci.h')
| -rw-r--r-- | arch/microblaze/include/asm/pci.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/microblaze/include/asm/pci.h b/arch/microblaze/include/asm/pci.h index efd4983cb697..114b93488193 100644 --- a/arch/microblaze/include/asm/pci.h +++ b/arch/microblaze/include/asm/pci.h @@ -81,9 +81,6 @@ extern pgprot_t pci_phys_mem_access_prot(struct file *file, #define HAVE_ARCH_PCI_RESOURCE_TO_USER -extern void pcibios_setup_bus_devices(struct pci_bus *bus); -extern void pcibios_setup_bus_self(struct pci_bus *bus); - /* This part of code was originally in xilinx-pci.h */ #ifdef CONFIG_PCI_XILINX extern void __init xilinx_pci_init(void); |