From patchwork Mon Aug 15 17:34:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabian Frederick X-Patchwork-Id: 9281657 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E74A6607FD for ; Mon, 15 Aug 2016 17:36:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D961D28E04 for ; Mon, 15 Aug 2016 17:36:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CDFFB28E14; Mon, 15 Aug 2016 17:36:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D301B28E04 for ; Mon, 15 Aug 2016 17:36:52 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bZLnO-0006pw-Sv; Mon, 15 Aug 2016 17:35:30 +0000 Received: from mailrelay117.isp.belgacom.be ([195.238.20.144]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bZLnJ-0005cb-HV for linux-arm-kernel@lists.infradead.org; Mon, 15 Aug 2016 17:35:27 +0000 X-Belgacom-Dynamic: yes X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A2B2BgCA/LFX/0VLtVtegnJTgVK1BIIpg?= =?us-ascii?q?g+BfYYdgVE5FAIBAQEBAQEBXieFOyOBGiQBEog1syuLBoYqiF2GCwWZPo8WAoF?= =?us-ascii?q?pjVhIhhyJSx42gUEBC4IvOjKFX4FFAQEB?= Received: from 69.75-181-91.adsl-dyn.isp.belgacom.be (HELO localhost.localdomain) ([91.181.75.69]) by relay.skynet.be with ESMTP; 15 Aug 2016 19:35:00 +0200 From: Fabian Frederick To: Jason Cooper , Andrew Lunn Subject: [PATCH 1/1 linux-next RESEND] ARM: multi_v7_defconfig: update XILINX_VDMA Date: Mon, 15 Aug 2016 19:34:44 +0200 Message-Id: <1471282484-10810-1-git-send-email-fabf@skynet.be> X-Mailer: git-send-email 2.8.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160815_103525_953130_F6BC417C X-CRM114-Status: UNSURE ( 5.45 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fabf@skynet.be, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Commit fde57a7c4474 ("dmaengine: xilinx: Rename driver and config") renamed config XILINX_VDMA to config XILINX_DMA Update defconfig accordingly. Signed-off-by: Fabian Frederick --- Sending to arm-soc (suggested by Shawn Guo) arch/arm/configs/multi_v7_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 7db8dce..d3ef852 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -784,7 +784,7 @@ CONFIG_MXS_DMA=y CONFIG_DMA_BCM2835=y CONFIG_DMA_OMAP=y CONFIG_QCOM_BAM_DMA=y -CONFIG_XILINX_VDMA=y +CONFIG_XILINX_DMA=y CONFIG_DMA_SUN6I=y CONFIG_STAGING=y CONFIG_SENSORS_ISL29018=y