From patchwork Tue Feb 14 11:49:32 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Pisati X-Patchwork-Id: 141105 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 095E51007D3 for ; Tue, 14 Feb 2012 22:49:49 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1RxGt9-00020D-3d; Tue, 14 Feb 2012 11:49:39 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1RxGt4-0001zl-Tx for kernel-team@lists.ubuntu.com; Tue, 14 Feb 2012 11:49:34 +0000 Received: from 2-230-238-136.ip204.fastwebnet.it ([2.230.238.136] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1RxGt4-0003D9-QN for kernel-team@lists.ubuntu.com; Tue, 14 Feb 2012 11:49:34 +0000 From: Paolo Pisati To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/2] UBUNTU: [Config] updateconfigs after CMA revert Date: Tue, 14 Feb 2012 12:49:32 +0100 Message-Id: <1329220173-9847-2-git-send-email-paolo.pisati@canonical.com> X-Mailer: git-send-email 1.7.9 In-Reply-To: <1329220173-9847-1-git-send-email-paolo.pisati@canonical.com> References: <1329220173-9847-1-git-send-email-paolo.pisati@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com Signed-off-by: Paolo Pisati --- debian.ti-omap4/config/config.common.ubuntu | 13 +------------ 1 files changed, 1 insertions(+), 12 deletions(-) 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