diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2012-02-24 14:25:33 -0800 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2012-02-24 14:25:33 -0800 |
| commit | ecd58d667a6ac4350d2f67b9accaadf575bae4b0 (patch) | |
| tree | 5209771a0a1f61820171e444d3e4a580ecf3955f /arch/sh/include/asm/pci.h | |
| parent | b07f2ebc109b607789f648dedcff4b125f9afec6 (diff) | |
| parent | fb127cb9de791d62fb393d6e65fa9869bddd2460 (diff) | |
Merge branch 'pci-next+probe_only+bus2res-fb127cb' of git://github.com/bjorn-helgaas/linux into linux-next
Diffstat (limited to 'arch/sh/include/asm/pci.h')
| -rw-r--r-- | arch/sh/include/asm/pci.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/sh/include/asm/pci.h b/arch/sh/include/asm/pci.h index cb21e2399dc..bff96c2e7d2 100644 --- a/arch/sh/include/asm/pci.h +++ b/arch/sh/include/asm/pci.h @@ -114,12 +114,6 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev, /* Board-specific fixup routines. */ int pcibios_map_platform_irq(const struct pci_dev *dev, u8 slot, u8 pin); -extern void pcibios_resource_to_bus(struct pci_dev *dev, - struct pci_bus_region *region, struct resource *res); - -extern void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res, - struct pci_bus_region *region); - #define pci_domain_nr(bus) ((struct pci_channel *)(bus)->sysdata)->index static inline int pci_proc_domain(struct pci_bus *bus) |