From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 19 Nov 2014 13:09:07 +0000 (+0100)
Subject: ARM64: use GENERIC_PCI_IOMAP
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=cb61f6769b8836081940ba26249f1b756400c7df;p=deliverable%2Flinux.git

ARM64: use GENERIC_PCI_IOMAP

Patch 09a5723983 ("arm64: Use include/asm-generic/io.h") correctly
removed the GENERIC_IOMAP selection from ARM64, which is not needed
on architectures that have memory-mapped PCI I/O space, however
we now lack a pci_iomap() function.

Fortunately, there is already a generic implementation for this
case, so we just need to select GENERIC_PCI_IOMAP to make it all
work.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 09a5723983 ("arm64: Use include/asm-generic/io.h")
---

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 37cd23625708..bc8879c283b9 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -25,6 +25,7 @@ config ARM64
 	select GENERIC_EARLY_IOREMAP
 	select GENERIC_IRQ_PROBE
 	select GENERIC_IRQ_SHOW
+	select GENERIC_PCI_IOMAP
 	select GENERIC_SCHED_CLOCK
 	select GENERIC_SMP_IDLE_THREAD
 	select GENERIC_STRNCPY_FROM_USER