lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PCI: fix pci_ioremap_bar() on s390

Browse Source 
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>
This commit is contained in:
Heiko Carstens
2008-10-20 19:45:43 +02:00
committed by Jesse Barnes
parent 270c66be9b
commit 96499871f4
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/pci.h
View File

@@ -1119,6 +1119,7 @@ static inline void pci_mmcfg_early_init(void) { }
static inline void pci_mmcfg_late_init(void) { } static inline void pci_mmcfg_late_init(void) { }
#endif #endif
#ifdef CONFIG_HAS_IOMEM
static inline void * pci_ioremap_bar(struct pci_dev *pdev, int bar) static inline void * pci_ioremap_bar(struct pci_dev *pdev, int bar)
{ {
/* /*
@@ -1131,6 +1132,7 @@ static inline void * pci_ioremap_bar(struct pci_dev *pdev, int bar)
return ioremap_nocache(pci_resource_start(pdev, bar), return ioremap_nocache(pci_resource_start(pdev, bar),
pci_resource_len(pdev, bar)); pci_resource_len(pdev, bar));
} }
#endif
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* LINUX_PCI_H */ #endif /* LINUX_PCI_H */