2 files changed, 6 insertions, 1 deletions

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index ba63cdbd13fe..3a3e54cc7703 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -28,6 +28,7 @@ config MIPS
         select HAVE_GENERIC_HARDIRQS
         select GENERIC_IRQ_PROBE
         select GENERIC_IRQ_SHOW
+        select GENERIC_PCI_IOMAP
         select HAVE_ARCH_JUMP_LABEL
         select ARCH_WANT_IPC_PARSE_VERSION
         select IRQ_FORCED_THREADING
@@ -2391,7 +2392,6 @@ config PCI
         bool "Support for PCI controller"
         depends on HW_HAS_PCI
         select PCI_DOMAINS
-        select GENERIC_PCI_IOMAP
         select NO_GENERIC_PCI_IOPORT_MAP
         help
           Find out whether you have a PCI motherboard. PCI is the name of a
diff --git a/arch/mips/include/asm/io.h b/arch/mips/include/asm/io.h
index b7e59853fd33..b84e1fb3fabf 100644
--- a/arch/mips/include/asm/io.h
+++ b/arch/mips/include/asm/io.h
@@ -170,6 +170,11 @@ static inline void * isa_bus_to_virt(unsigned long address)
 extern void __iomem * __ioremap(phys_t offset, phys_t size, unsigned long flags);
 extern void __iounmap(const volatile void __iomem *addr);
 
+#ifndef CONFIG_PCI
+struct pci_dev;
+static inline void pci_iounmap(struct pci_dev *dev, void __iomem *addr) {}
+#endif
+
 static inline void __iomem * __ioremap_mode(phys_t offset, unsigned long size,
         unsigned long flags)
 {