Merge "Comcerto: Enable ZONE_DMA"
diff --git a/arch/arm/mach-comcerto/Kconfig b/arch/arm/mach-comcerto/Kconfig
index 84098f0..0a8d2fd 100644
--- a/arch/arm/mach-comcerto/Kconfig
+++ b/arch/arm/mach-comcerto/Kconfig
@@ -30,6 +30,7 @@
select GENERIC_CLOCKEVENTS
select HAVE_SCHED_CLOCK
select COMCERTO_DW_DMA_SUPPORT
+ select ZONE_DMA
select CLKDEV_LOOKUP
select ARCH_HAS_CPUFREQ
select ARCH_HAS_OPP
@@ -220,7 +221,7 @@
config COMCERTO_ZONE_DMA_NCNB
bool "Comcerto Zone DMA"
- select ZONE_DMA
+ depends on ZONE_DMA
default n
config COMCERTO_CUSTOM_SKB_LAYOUT