From patchwork Thu Mar 1 19:26:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Ott X-Patchwork-Id: 144101 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 03DAD1007D5 for ; Fri, 2 Mar 2012 06:29:31 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964939Ab2CAT13 (ORCPT ); Thu, 1 Mar 2012 14:27:29 -0500 Received: from mail-gy0-f174.google.com ([209.85.160.174]:38913 "EHLO mail-gy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964922Ab2CAT10 (ORCPT ); Thu, 1 Mar 2012 14:27:26 -0500 Received: by mail-gy0-f174.google.com with SMTP id r11so449933ghr.19 for ; Thu, 01 Mar 2012 11:27:26 -0800 (PST) Received-SPF: pass (google.com: domain of alan@signal11.us designates 10.236.80.39 as permitted sender) client-ip=10.236.80.39; Authentication-Results: mr.google.com; spf=pass (google.com: domain of alan@signal11.us designates 10.236.80.39 as permitted sender) smtp.mail=alan@signal11.us Received: from mr.google.com ([10.236.80.39]) by 10.236.80.39 with SMTP id j27mr9181976yhe.92.1330630046553 (num_hops = 1); Thu, 01 Mar 2012 11:27:26 -0800 (PST) MIME-Version: 1.0 Received: by 10.236.80.39 with SMTP id j27mr7247689yhe.92.1330630046474; Thu, 01 Mar 2012 11:27:26 -0800 (PST) Received: from localhost.localdomain (c-68-62-240-236.hsd1.fl.comcast.net. [68.62.240.236]) by mx.google.com with ESMTPS id 34sm4685140anu.6.2012.03.01.11.27.25 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 01 Mar 2012 11:27:26 -0800 (PST) From: Alan Ott To: Russell King , Colin Cross , Olof Johansson , Stephen Warren , Grant Likely , Linus Walleij , Alan Stern , Greg Kroah-Hartman , Lucas De Marchi , Arnd Bergmann , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-tegra@vger.kernel.org, linux-usb@vger.kernel.org Cc: Arnd Bergmann Subject: [PATCH 2/8] ARM: tegra: do not hide dma declarations Date: Thu, 1 Mar 2012 14:26:44 -0500 Message-Id: <1330630010-11241-3-git-send-email-alan@signal11.us> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1330630010-11241-1-git-send-email-alan@signal11.us> References: <1330630010-11241-1-git-send-email-alan@signal11.us> X-Gm-Message-State: ALoCoQlJEpnEQ392BywoEhO5MUsGk/Wdgusv6TBeYgo+jlBDQ7g+gLTKlszRLg2Yt8DnQC8lWYjS Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org From: Arnd Bergmann The declarations are actually required for the device definitions, and are still valid even if the dma controller is disabled: arch/arm/mach-tegra/devices.c:559:12: error: 'TEGRA_DMA_REQ_SEL_I2S_1' undeclared here (not in a function) arch/arm/mach-tegra/devices.c:577:12: error: 'TEGRA_DMA_REQ_SEL_I2S2_1' undeclared here (not in a function) Signed-off-by: Arnd Bergmann --- arch/arm/mach-tegra/include/mach/dma.h | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-tegra/include/mach/dma.h b/arch/arm/mach-tegra/include/mach/dma.h index 3c93390..9077092 100644 --- a/arch/arm/mach-tegra/include/mach/dma.h +++ b/arch/arm/mach-tegra/include/mach/dma.h @@ -51,8 +51,6 @@ #define TEGRA_DMA_REQ_SEL_OWR 25 #define TEGRA_DMA_REQ_SEL_INVALID 31 -#if defined(CONFIG_TEGRA_SYSTEM_DMA) - struct tegra_dma_req; struct tegra_dma_channel; @@ -151,5 +149,3 @@ void tegra_dma_free_channel(struct tegra_dma_channel *ch); int __init tegra_dma_init(void); #endif - -#endif