summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-03-02 12:25:37 +0000
committerStephen Warren <swarren@nvidia.com>2012-04-16 12:41:24 -0600
commit65e8d272ba483dac3b5f724e938dda099e49a7e1 (patch)
tree3ee13387554e32368d4a242e2e617b59e924cc20
parenteb75bb7a0e0ed6077ea45f2692526283e1087737 (diff)
downloadop-kernel-dev-65e8d272ba483dac3b5f724e938dda099e49a7e1.zip
op-kernel-dev-65e8d272ba483dac3b5f724e938dda099e49a7e1.tar.gz
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 <arnd@arndb.de> Signed-off-by: Alan Ott <alan@signal11.us> Signed-off-by: Stephen Warren <swarren@nvidia.com>
-rw-r--r--arch/arm/mach-tegra/include/mach/dma.h4
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 3c9339058..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
OpenPOWER on IntegriCloud