aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/pci.h
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2008-10-20 13:45:43 -0400
committerJesse Barnes <jbarnes@virtuousgeek.org>2008-10-20 14:28:34 -0400
commit96499871f45b9126157b1a5c512d6e30f1635225 (patch)
treee32b112aa25dca6f3e4278e5718c1c2135e6519d /include/linux/pci.h
parent270c66be9b4a6f2be53ef3aec5dc8e7b07782ec9 (diff)
PCI: fix pci_ioremap_bar() on s390
s390 doesn't have ioremap_*, so protect the definition of the new pci_ioremap_bar function with CONFIG_HAS_IOMEM to avoid build breakage. Acked-by: Arjan van de Ven <arjan@linux.intel.com> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'include/linux/pci.h')
-rw-r--r--include/linux/pci.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 46ad282ffe4d..085187be29c7 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1119,6 +1119,7 @@ static inline void pci_mmcfg_early_init(void) { }
1119static inline void pci_mmcfg_late_init(void) { } 1119static inline void pci_mmcfg_late_init(void) { }
1120#endif 1120#endif
1121 1121
1122#ifdef CONFIG_HAS_IOMEM
1122static inline void * pci_ioremap_bar(struct pci_dev *pdev, int bar) 1123static inline void * pci_ioremap_bar(struct pci_dev *pdev, int bar)
1123{ 1124{
1124 /* 1125 /*
@@ -1131,6 +1132,7 @@ static inline void * pci_ioremap_bar(struct pci_dev *pdev, int bar)
1131 return ioremap_nocache(pci_resource_start(pdev, bar), 1132 return ioremap_nocache(pci_resource_start(pdev, bar),
1132 pci_resource_len(pdev, bar)); 1133 pci_resource_len(pdev, bar));
1133} 1134}
1135#endif
1134 1136
1135#endif /* __KERNEL__ */ 1137#endif /* __KERNEL__ */
1136#endif /* LINUX_PCI_H */ 1138#endif /* LINUX_PCI_H */