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: 1486011 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id F24263FD40 for ; Thu, 20 Sep 2012 14:46:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755932Ab2ITOpk (ORCPT ); Thu, 20 Sep 2012 10:45:40 -0400 Received: from mail-iy0-f174.google.com ([209.85.210.174]:51869 "EHLO mail-iy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755567Ab2ITOmX (ORCPT ); Thu, 20 Sep 2012 10:42:23 -0400 Received: by mail-iy0-f174.google.com with SMTP id k25so1691219iah.19 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 Cc: Devicetree Discuss , Linux OMAP List , Linux ARM Kernel List , Linux DaVinci Kernel List , Linux Kernel Mailing List , Linux Documentation List , Linux MMC List , Linux SPI Devel List , Arnd Bergmann , Dan Williams , Rob Herring 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> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.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"