ARM: tegra: do not hide dma declarations
authorArnd Bergmann <arnd@arndb.de>
Fri, 2 Mar 2012 12:25:37 +0000 (12:25 +0000)
committerStephen Warren <swarren@nvidia.com>
Mon, 16 Apr 2012 18:41:24 +0000 (12:41 -0600)
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 <arnd@arndb.de>
Signed-off-by: Alan Ott <alan@signal11.us>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
arch/arm/mach-tegra/include/mach/dma.h

index 3c93390..9077092 100644 (file)
@@ -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