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: 1485821 Return-Path: X-Original-To: patchwork-davinci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from devils.ext.ti.com (devils.ext.ti.com [198.47.26.153]) by patchwork1.kernel.org (Postfix) with ESMTP id E459F3FD40 for ; Thu, 20 Sep 2012 14:44:57 +0000 (UTC) Received: from dlelxv30.itg.ti.com ([172.17.2.17]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id q8KEhYsH008347; Thu, 20 Sep 2012 09:43:34 -0500 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dlelxv30.itg.ti.com (8.13.8/8.13.8) with ESMTP id q8KEhY4n014933; Thu, 20 Sep 2012 09:43:34 -0500 Received: from dlelxv24.itg.ti.com (172.17.1.199) by dfle73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.1.323.3; Thu, 20 Sep 2012 09:43:34 -0500 Received: from linux.omap.com (dlelxs01.itg.ti.com [157.170.227.31]) by dlelxv24.itg.ti.com (8.13.8/8.13.8) with ESMTP id q8KEhYrh007569; Thu, 20 Sep 2012 09:43:34 -0500 Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id 274368062A; Thu, 20 Sep 2012 09:43:34 -0500 (CDT) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dflp51.itg.ti.com (dflp51.itg.ti.com [128.247.22.94]) by linux.omap.com (Postfix) with ESMTP id A0F8F8062A for ; Thu, 20 Sep 2012 09:42:24 -0500 (CDT) Received: from red.ext.ti.com (red.ext.ti.com [192.94.93.37]) by dflp51.itg.ti.com (8.13.7/8.13.8) with ESMTP id q8KEgOnx009322 for ; Thu, 20 Sep 2012 09:42:24 -0500 (CDT) Received: from psmtp.com (na3sys009amx171.postini.com [74.125.149.97]) by red.ext.ti.com (8.13.7/8.13.7) with SMTP id q8KEgMcJ011772 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 20 Sep 2012 09:42:23 -0500 Received: from mail-ie0-f173.google.com ([209.85.223.173]) (using TLSv1) by na3sys009amx171.postini.com ([74.125.148.10]) with SMTP; Thu, 20 Sep 2012 14:42:23 GMT Received: by mail-ie0-f173.google.com with SMTP id c10so3339295ieb.4 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-pstn-levels: (S:99.90000/99.90000 CV:99.9000 FC:95.5390 LC:95.5390 R:95.9108 P:95.9108 M:97.0282 C:98.6951 ) X-pstn-dkim: 1 skipped:not-enabled X-pstn-settings: 2 (0.5000:0.0050) s cv GT3 gt2 gt1 r p m c X-pstn-addresses: from [82/3] 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: davinci-linux-open-source@linux.davincidsp.com X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: Errors-To: davinci-linux-open-source-bounces@linux.davincidsp.com 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"