Patchwork [1/2] UBUNTU: [Config] updateconfigs after CMA revert

login
register
mail settings
Submitter Paolo Pisati
Date Feb. 14, 2012, 11:49 a.m.
Message ID <1329220173-9847-2-git-send-email-paolo.pisati@canonical.com>
Download mbox | patch
Permalink /patch/141105/
State New
Headers show

Comments

Paolo Pisati - Feb. 14, 2012, 11:49 a.m.
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
---
 debian.ti-omap4/config/config.common.ubuntu |   13 +------------
 1 files changed, 1 insertions(+), 12 deletions(-)

Patch

diff --git a/debian.ti-omap4/config/config.common.ubuntu b/debian.ti-omap4/config/config.common.ubuntu
index 89d8811..c1265f5 100644
--- a/debian.ti-omap4/config/config.common.ubuntu
+++ b/debian.ti-omap4/config/config.common.ubuntu
@@ -532,15 +532,6 @@  CONFIG_CLKDEV_LOOKUP=y
 CONFIG_CLKSRC_MMIO=y
 CONFIG_CLS_U32_MARK=y
 # CONFIG_CLS_U32_PERF is not set
-CONFIG_CMA=y
-CONFIG_CMA_ALIGNMENT=8
-CONFIG_CMA_AREAS=7
-# CONFIG_CMA_DEBUG is not set
-CONFIG_CMA_SIZE_MBYTES=16
-# CONFIG_CMA_SIZE_SEL_MAX is not set
-CONFIG_CMA_SIZE_SEL_MBYTES=y
-# CONFIG_CMA_SIZE_SEL_MIN is not set
-# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
 CONFIG_CMDLINE="console=ttyO2,115200n8 root=/dev/mmcblk0p2 rw rootwait mem=1G"
 # CONFIG_CMDLINE_EXTEND is not set
 # CONFIG_CMDLINE_FORCE is not set
@@ -1115,7 +1106,6 @@  CONFIG_HAVE_ARM_TWD=y
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_C_RECORDMCOUNT=y
 CONFIG_HAVE_DMA_API_DEBUG=y
-CONFIG_HAVE_DMA_CONTIGUOUS=y
 CONFIG_HAVE_DYNAMIC_FTRACE=y
 CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
 CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
@@ -3969,7 +3959,6 @@  CONFIG_ZEROPLUS_FF=y
 CONFIG_ZISOFS=y
 CONFIG_ZLIB_DEFLATE=m
 CONFIG_ZLIB_INFLATE=y
-CONFIG_ZONE_DMA=y
-CONFIG_ZONE_DMA_FLAG=1
+CONFIG_ZONE_DMA_FLAG=0
 CONFIG_ZRAM=m
 # CONFIG_ZRAM_DEBUG is not set