From patchwork Thu Sep 20 14:43:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Porter X-Patchwork-Id: 1485881 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 40D503FD40 for ; Thu, 20 Sep 2012 14:45:08 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TEhxs-0005hN-Ki; Thu, 20 Sep 2012 14:42:52 +0000 Received: from mail-iy0-f177.google.com ([209.85.210.177]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TEhxO-0005Z8-UU for linux-arm-kernel@lists.infradead.org; Thu, 20 Sep 2012 14:42:27 +0000 Received: by mail-iy0-f177.google.com with SMTP id i1so1886382iaa.36 for ; Thu, 20 Sep 2012 07:42:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=c06V/lEmEGWJs0DXAzuC6zop2qHQs96i5+TpvNSmkOQ=; b=cJMeyq2Sm9mBkkUbzKt5gP2pWSznsklomAlES3TlO64xl0DZ8dLIYU36m23U2mDr/x WSfyMd14aYNP/NzJe0+yu9nQswEXoeNfXrbIdvnjpFMWTse4vAk9lpHTTsZhlg9JWMCB PL4F0IYgMtbCZvdQLe5KWATcM0YwDLC4usesTBWw2ORTYgYNz21HePjV8O8G9YvqTpQr VcsQIR+C546BvX/6v2T72yuPAdJoEU9/3yqkH1WVL3fVwkTDrg/thNftVH02SDt2TZq6 3RW4oynP+RJXUEaFE+Q+O4c7oKFkXmDMrXJTpSTScz+Ci6FdxvARZat271YqY8zmbcDp 6gWw== Received: by 10.50.87.167 with SMTP id az7mr1897409igb.40.1348152142708; Thu, 20 Sep 2012 07:42:22 -0700 (PDT) Received: from beef.ohporter.com (cpe-24-166-64-7.neo.res.rr.com. [24.166.64.7]) by mx.google.com with ESMTPS id p5sm15288242igm.13.2012.09.20.07.42.20 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 20 Sep 2012 07:42:22 -0700 (PDT) From: Matt Porter To: Tony Lindgren , Sekhar Nori , Grant Likely , Mark Brown , Benoit Cousson , Russell King , Vinod Koul , Rob Landley , Chris Ball Subject: [RFC PATCH 04/13] dmaengine: edma: enable build for AM335x Date: Thu, 20 Sep 2012 10:43:37 -0400 Message-Id: <1348152226-13588-5-git-send-email-mporter@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1348152226-13588-1-git-send-email-mporter@ti.com> References: <1348152226-13588-1-git-send-email-mporter@ti.com> X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.210.177 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (ohiomdp[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Linux DaVinci Kernel List , Arnd Bergmann , Linux Documentation List , Devicetree Discuss , Linux MMC List , Linux Kernel Mailing List , Rob Herring , Dan Williams , Linux SPI Devel List , Linux OMAP List , Linux ARM Kernel List X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Enable config option on OMAP and adjust the private EDMA API header to match the move of the private EDMA API out of mach-davinci/ Signed-off-by: Matt Porter --- drivers/dma/Kconfig | 2 +- drivers/dma/edma.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index 0351719..24cd403 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig @@ -210,7 +210,7 @@ config SIRF_DMA config TI_EDMA tristate "TI EDMA support" - depends on ARCH_DAVINCI + depends on ARCH_DAVINCI || ARCH_OMAP select DMA_ENGINE select DMA_VIRTUAL_CHANNELS default n diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c index fdcf079..9f8f2fa 100644 --- a/drivers/dma/edma.c +++ b/drivers/dma/edma.c @@ -24,7 +24,7 @@ #include #include -#include +#include #include "dmaengine.h" #include "virt-dma.h"