From: Arnd Bergmann Date: Fri, 2 Mar 2012 12:25:37 +0000 (+0000) Subject: ARM: tegra: do not hide dma declarations X-Git-Tag: v3.5-rc1~156^2~9^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=65e8d272ba483dac3b5f724e938dda099e49a7e1;p=thirdparty%2Flinux.git ARM: tegra: do not hide dma declarations 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 Signed-off-by: Alan Ott Signed-off-by: Stephen Warren --- diff --git a/arch/arm/mach-tegra/include/mach/dma.h b/arch/arm/mach-tegra/include/mach/dma.h index 3c9339058bec1..9077092812c0e 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