Merge branch 'akpm' (fixes from Andrew Morton)

[sfrench/cifs-2.6.git] / arch / arm64 / Kconfig

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 73bfb477ca0db258048de9005634ba84538ea47c..c49ca4c738bb2ede8664d7ac6bcb70bfa994a993 100644 (file)
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -85,7 +85,7 @@ config MMU
        def_bool y
 
 config NO_IOPORT_MAP
-       def_bool y
+       def_bool y if !PCI
 
 config STACKTRACE_SUPPORT
        def_bool y
@@ -168,6 +168,26 @@ menu "Bus support"
 config ARM_AMBA
        bool
 
+config PCI
+       bool "PCI support"
+       help
+         This feature enables support for PCI bus system. If you say Y
+         here, the kernel will include drivers and infrastructure code
+         to support PCI bus devices.
+
+config PCI_DOMAINS
+       def_bool PCI
+
+config PCI_DOMAINS_GENERIC
+       def_bool PCI
+
+config PCI_SYSCALL
+       def_bool PCI
+
+source "drivers/pci/Kconfig"
+source "drivers/pci/pcie/Kconfig"
+source "drivers/pci/hotplug/Kconfig"
+
 endmenu
 
 menu "Kernel Features"