X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=arch%2Farm%2FKconfig;h=8928b21a2dba2bce9061ad02e4546f03eea42041;hb=91b006def384d8f07f9f324ab211fefe2b085c90;hp=acd12efe6f3e133ff9f8f5bc37cddff7d546e634;hpb=339ca09d7adac80eda8d097ab473c6c23ee86b17;p=~andy%2Flinux

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index acd12efe6f3..8928b21a2db 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -7,7 +7,6 @@ config ARM
 	select HAVE_IDE if PCI || ISA || PCMCIA
 	select HAVE_DMA_ATTRS
 	select HAVE_DMA_CONTIGUOUS if (CPU_V6 || CPU_V6K || CPU_V7)
-	select CMA if (CPU_V6 || CPU_V6K || CPU_V7)
 	select HAVE_MEMBLOCK
 	select RTC_LIB
 	select SYS_SUPPORTS_APM_EMULATION
@@ -297,6 +296,7 @@ config ARCH_VERSATILE
 	select ICST
 	select GENERIC_CLOCKEVENTS
 	select ARCH_WANT_OPTIONAL_GPIOLIB
+	select NEED_MACH_IO_H if PCI
 	select PLAT_VERSATILE
 	select PLAT_VERSATILE_CLCD
 	select PLAT_VERSATILE_FPGA_IRQ
@@ -592,6 +592,7 @@ config ARCH_ORION5X
 	select PCI
 	select ARCH_REQUIRE_GPIOLIB
 	select GENERIC_CLOCKEVENTS
+	select NEED_MACH_IO_H
 	select PLAT_ORION
 	help
 	  Support for the following Marvell Orion 5x series SoCs: