From 46c756b8781e49687e906c4b3207a94d0d72fbe7 Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Mon, 20 Oct 2008 19:45:43 +0200 Subject: [PATCH] --- yaml --- r: 116734 b: refs/heads/master c: 96499871f45b9126157b1a5c512d6e30f1635225 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/pci.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c02b074abc71..5b8677d6e10f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 270c66be9b4a6f2be53ef3aec5dc8e7b07782ec9 +refs/heads/master: 96499871f45b9126157b1a5c512d6e30f1635225 diff --git a/trunk/include/linux/pci.h b/trunk/include/linux/pci.h index 46ad282ffe4d..085187be29c7 100644 --- a/trunk/include/linux/pci.h +++ b/trunk/include/linux/pci.h @@ -1119,6 +1119,7 @@ static inline void pci_mmcfg_early_init(void) { } static inline void pci_mmcfg_late_init(void) { } #endif +#ifdef CONFIG_HAS_IOMEM 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), pci_resource_len(pdev, bar)); } +#endif #endif /* __KERNEL__ */ #endif /* LINUX_PCI_H */