From patchwork Fri Feb 28 00:20:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Santosh Shilimkar X-Patchwork-Id: 25495 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f200.google.com (mail-pd0-f200.google.com [209.85.192.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E237B20543 for ; Fri, 28 Feb 2014 00:21:26 +0000 (UTC) Received: by mail-pd0-f200.google.com with SMTP id p10sf7224534pdj.7 for ; Thu, 27 Feb 2014 16:21:26 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :mime-version:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe:content-type; bh=Z1c6SPPe8DADlVFUeOxUuarOkZBIRREvw9/TD/wlyNg=; b=RGuMs+4fExyzwy8Quk+CBRx/huFI+KBMNI+CSE55KeZWajU2uK7nQKms+Qr+263EoX A2ECBUdbgiTNdFhVOFu1vMwjOlcbR7FgU1q95F7JdmDNi35wx2SpVA31uos+G/yOhNhU 8nGWXr2mQ1eP4wa5ip0SlnW3ZbRa1+LIQUEnqNkAPBTaqn77xcL0i7ixTqxqqjCllw4H S66TtjAMLs405oca/1JekYLhR62ClhJv3uk0SPaYi548kado+hhvFNidn2f142ttR8i+ uSim93GwXKygJbCH/vV1dC7rZkHklQ3axoOY882hjCgGYWViWO+y6qmoSk1a5pIaQ2Cv Odng== X-Gm-Message-State: ALoCoQkWR4QGubK4r26v7A/eHuo2ilKmsw5EqrMpTsfmG+EDVpTpvuit8U94/YRjtqufoKkqT65N X-Received: by 10.66.197.167 with SMTP id iv7mr7279134pac.12.1393546886163; Thu, 27 Feb 2014 16:21:26 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.27.117 with SMTP id 108ls922614qgw.77.gmail; Thu, 27 Feb 2014 16:21:26 -0800 (PST) X-Received: by 10.221.20.199 with SMTP id qp7mr13175594vcb.24.1393546886058; Thu, 27 Feb 2014 16:21:26 -0800 (PST) Received: from mail-vc0-f173.google.com (mail-vc0-f173.google.com [209.85.220.173]) by mx.google.com with ESMTPS id uc1si2314547vcb.53.2014.02.27.16.21.26 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 27 Feb 2014 16:21:26 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.173; Received: by mail-vc0-f173.google.com with SMTP id ld13so3269631vcb.4 for ; Thu, 27 Feb 2014 16:21:26 -0800 (PST) X-Received: by 10.58.186.132 with SMTP id fk4mr13056746vec.9.1393546885966; Thu, 27 Feb 2014 16:21:25 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.130.193 with SMTP id u1csp15464vcs; Thu, 27 Feb 2014 16:21:25 -0800 (PST) X-Received: by 10.66.158.35 with SMTP id wr3mr18311896pab.126.1393546884610; Thu, 27 Feb 2014 16:21:24 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id uc9si863396pac.326.2014.02.27.16.21.23; Thu, 27 Feb 2014 16:21:23 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751635AbaB1AVW (ORCPT + 9 others); Thu, 27 Feb 2014 19:21:22 -0500 Received: from arroyo.ext.ti.com ([192.94.94.40]:53573 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751255AbaB1AVW (ORCPT ); Thu, 27 Feb 2014 19:21:22 -0500 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id s1S0KrbQ024478; Thu, 27 Feb 2014 18:20:53 -0600 Received: from DLEE70.ent.ti.com (dlemailx.itg.ti.com [157.170.170.113]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id s1S0KrHp006511; Thu, 27 Feb 2014 18:20:53 -0600 Received: from dflp32.itg.ti.com (10.64.6.15) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.3.174.1; Thu, 27 Feb 2014 18:20:52 -0600 Received: from ula0393909.am.dhcp.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id s1S0KqnA029077; Thu, 27 Feb 2014 18:20:52 -0600 From: Santosh Shilimkar To: CC: , , Santosh Shilimkar , Grant Likely , Rob Herring Subject: [PATCH] dma: of: Move the functions under CONFIG_OF_DMA instead of CONFIG_OF Date: Thu, 27 Feb 2014 19:20:50 -0500 Message-ID: <1393546850-13907-1-git-send-email-santosh.shilimkar@ti.com> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: devicetree@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: santosh.shilimkar@ti.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The of-dma.c is compiled out with !CONFIG_OF_DMA but the functions in the header are kept under CONFIG_OF. Move them under CONFIG_OF_DMA to avoid build errors with CONFIG_OFF && !CONFIG_OF_DMA Cc: Grant Likely Cc: Rob Herring Signed-off-by: Santosh Shilimkar --- include/linux/of_dma.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/of_dma.h b/include/linux/of_dma.h index 0322363..3d2beab 100644 --- a/include/linux/of_dma.h +++ b/include/linux/of_dma.h @@ -31,7 +31,7 @@ struct of_dma_filter_info { dma_filter_fn filter_fn; }; -#ifdef CONFIG_OF +#ifdef CONFIG_OF_DMA extern int of_dma_controller_register(struct device_node *np, struct dma_chan *(*of_dma_xlate) (struct of_phandle_args *, struct of_dma *),