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 /include/asm-generic/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 'include/asm-generic/pci.h')
-rw-r--r-- | include/asm-generic/pci.h | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/include/asm-generic/pci.h b/include/asm-generic/pci.h index 26373cff454..e80a0495e5b 100644 --- a/include/asm-generic/pci.h +++ b/include/asm-generic/pci.h @@ -6,30 +6,6 @@ #ifndef _ASM_GENERIC_PCI_H #define _ASM_GENERIC_PCI_H -/** - * pcibios_resource_to_bus - convert resource to PCI bus address - * @dev: device which owns this resource - * @region: converted bus-centric region (start,end) - * @res: resource to convert - * - * Convert a resource to a PCI device bus address or bus window. - */ -static inline void -pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region, - struct resource *res) -{ - region->start = res->start; - region->end = res->end; -} - -static inline void -pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res, - struct pci_bus_region *region) -{ - res->start = region->start; - res->end = region->end; -} - static inline struct resource * pcibios_select_root(struct pci_dev *pdev, struct resource *res) { |