diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/io.h | 6 | ||||
| -rw-r--r-- | include/linux/pci.h | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/include/linux/io.h b/include/linux/io.h index 9e419ebfc98b..c244a0cc9319 100644 --- a/include/linux/io.h +++ b/include/linux/io.h | |||
| @@ -43,12 +43,6 @@ void __iomem * devm_ioremap_nocache(struct device *dev, unsigned long offset, | |||
| 43 | unsigned long size); | 43 | unsigned long size); |
| 44 | void devm_iounmap(struct device *dev, void __iomem *addr); | 44 | void devm_iounmap(struct device *dev, void __iomem *addr); |
| 45 | 45 | ||
| 46 | void __iomem * pcim_iomap(struct pci_dev *pdev, int bar, unsigned long maxlen); | ||
| 47 | void pcim_iounmap(struct pci_dev *pdev, void __iomem *addr); | ||
| 48 | void __iomem * const * pcim_iomap_table(struct pci_dev *pdev); | ||
| 49 | |||
| 50 | int pcim_iomap_regions(struct pci_dev *pdev, u16 mask, const char *name); | ||
| 51 | |||
| 52 | /** | 46 | /** |
| 53 | * check_signature - find BIOS signatures | 47 | * check_signature - find BIOS signatures |
| 54 | * @io_addr: mmio address to check | 48 | * @io_addr: mmio address to check |
diff --git a/include/linux/pci.h b/include/linux/pci.h index 9e3042e7e1cc..98c8765a488e 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
| @@ -840,6 +840,11 @@ enum pci_fixup_pass { | |||
| 840 | 840 | ||
| 841 | void pci_fixup_device(enum pci_fixup_pass pass, struct pci_dev *dev); | 841 | void pci_fixup_device(enum pci_fixup_pass pass, struct pci_dev *dev); |
| 842 | 842 | ||
| 843 | void __iomem * pcim_iomap(struct pci_dev *pdev, int bar, unsigned long maxlen); | ||
| 844 | void pcim_iounmap(struct pci_dev *pdev, void __iomem *addr); | ||
| 845 | void __iomem * const * pcim_iomap_table(struct pci_dev *pdev); | ||
| 846 | int pcim_iomap_regions(struct pci_dev *pdev, u16 mask, const char *name); | ||
| 847 | |||
| 843 | extern int pci_pci_problems; | 848 | extern int pci_pci_problems; |
| 844 | #define PCIPCI_FAIL 1 /* No PCI PCI DMA */ | 849 | #define PCIPCI_FAIL 1 /* No PCI PCI DMA */ |
| 845 | #define PCIPCI_TRITON 2 | 850 | #define PCIPCI_TRITON 2 |
