Merge tag 'v3.10.79' into linux-linaro-lsk-v3.10

[firefly-linux-kernel-4.4.55.git] / include / asm-generic / pci_iomap.h

diff --git a/include/asm-generic/pci_iomap.h b/include/asm-generic/pci_iomap.h
index e58fcf891370e73996a7fe09b510a7b61d7a9fb8..ce37349860fece8cdf991165db8c8849a677e270 100644 (file)
--- a/include/asm-generic/pci_iomap.h
+++ b/include/asm-generic/pci_iomap.h
@@ -25,7 +25,7 @@ extern void __iomem *__pci_ioport_map(struct pci_dev *dev, unsigned long port,
 #define __pci_ioport_map(dev, port, nr) ioport_map((port), (nr))
 #endif
 
-#else
+#elif defined(CONFIG_GENERIC_PCI_IOMAP)
 static inline void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max)
 {
        return NULL;