From patchwork Wed Sep 11 14:52:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 11141275 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 69F9113BD for ; Wed, 11 Sep 2019 14:52:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 45A312084F for ; Wed, 11 Sep 2019 14:52:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="EJxgSrwx" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728244AbfIKOwt (ORCPT ); Wed, 11 Sep 2019 10:52:49 -0400 Received: from mail-io1-f65.google.com ([209.85.166.65]:37634 "EHLO mail-io1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727873AbfIKOws (ORCPT ); Wed, 11 Sep 2019 10:52:48 -0400 Received: by mail-io1-f65.google.com with SMTP id r4so46440205iop.4; Wed, 11 Sep 2019 07:52:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=EK6qCrLs052uo8saG/CKa8ACsOJwz6xJszIlrDZpsn0=; b=EJxgSrwxeKZnsDxcEKl73+la0dwFwYX53cwgBqHkUzfOWdRkYE1XxsiDi4DrMNJIMR Huj0+fS8TUIXfbu1WeaeSOSEWJu+b1sZzSPtc9ZT8dMDVMnG7QCx5o4v8y5V2leVJ56q f99gBbjGPULCbdirwzwaa/++SJrrJzkUtv/jscMiHbSeFamYbaDaO2HFlvO8fInoeEzi UiFsGXrbMxO6Um0muMOiSruK/WVsGTrAxZaQp4Z5xHc10NOy4hB8sAALYxVhvHhJO4vs sTjqzQJVaoqNj9Z0fh5YESgsloEsoGJRWtY546a46OFbfT1osPKkAHd3FiG6PUHRAGlw YScQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=EK6qCrLs052uo8saG/CKa8ACsOJwz6xJszIlrDZpsn0=; b=c6EligcLbwWRyQzt4E6vOQQMrRjwZZ4k6H9XpVvNHRDP8Yfym/PcncUu1+OT/xj7Hb wnE1DiIyr29bm/ACOG0gTdupndr7mG0fE5N0x4lVwoeKnK1vnnV2fMPSCqGTaIyGgWca nOeIUi2NROiqoIzgexdAOGTF9tykyx8GpUaF2Tgz2gtFrdwGC4of+GBK/ahkM0xJ2PlL UVu1cu0eA1NdvVZ7mQgDDHn/aENuSQyjf/bLyVG7wykUjwjCv28GTmPnXv3eUULT7ZeZ E7bIHb8SwhB+is6GXWiOaljkfcE78CdKOfODi9txgCfbZ0PHqU7gdGIWvP/flrfpGsiq ycyw== X-Gm-Message-State: APjAAAXAb6d2BluCTz0nBeu0RSm/3AAX5OgS38AOWddFYVM4YKMFbmT0 XaLVcbsiuI89I4YLSfCwPFiwFW09 X-Google-Smtp-Source: APXvYqwmkuACqYgeZMs8kyMj9c/8J+l6z2tWpsZtI2fuCEHycQPjmI33v7tLfm0zVUbqyA5tbqGiKA== X-Received: by 2002:a6b:acc5:: with SMTP id v188mr43578191ioe.268.1568213567401; Wed, 11 Sep 2019 07:52:47 -0700 (PDT) Received: from localhost.localdomain (c-73-37-219-234.hsd1.mn.comcast.net. [73.37.219.234]) by smtp.gmail.com with ESMTPSA id p25sm17109904ioo.35.2019.09.11.07.52.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Sep 2019 07:52:46 -0700 (PDT) From: Adam Ford To: linux-omap@vger.kernel.org Cc: adam.ford@logicpd.com, Adam Ford , Tony Lindgren , Russell King , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] ARM: omap2plus_defconfig: Update for moved item Date: Wed, 11 Sep 2019 09:52:26 -0500 Message-Id: <20190911145226.21088-2-aford173@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190911145226.21088-1-aford173@gmail.com> References: <20190911145226.21088-1-aford173@gmail.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org When running make savedefconfig ARCH=arm, CONFIG_DMA_CMA changed location. To help facilitate future changes to omap2plus_defconfig, this patch re-syncs the omap2plus file with the updated location generated by make savedefconfig. No items were removed or added during this patch. Signed-off-by: Adam Ford diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig index 166b36be2ca6..a0449d3b48a5 100644 --- a/arch/arm/configs/omap2plus_defconfig +++ b/arch/arm/configs/omap2plus_defconfig @@ -128,7 +128,6 @@ CONFIG_PCI_ENDPOINT_CONFIGFS=y CONFIG_PCI_EPF_TEST=m CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y -CONFIG_DMA_CMA=y CONFIG_OMAP_OCP2SCP=y CONFIG_CONNECTOR=m CONFIG_MTD=y @@ -537,6 +536,7 @@ CONFIG_CRC_T10DIF=y CONFIG_CRC_ITU_T=y CONFIG_CRC7=y CONFIG_LIBCRC32C=y +CONFIG_DMA_CMA=y CONFIG_FONTS=y CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y