Merge branch 'for-3.5/cleanup' of git://git.kernel.org/pub/scm/linux/…

…kernel/git/swarren/linux-tegra into next/cleanup By Arnd Bergmann (1) and Danny Kukawka (1) via Stephen Warren * 'for-3.5/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra: ARM: tegra: do not hide dma declarations ARM: tegra: fix multiple asm/hardware/gic.h inclusion Signed-off-by: Olof Johansson <olof@lixom.net>
git-mirror · May 10, 2012 · a72ce69 · a72ce69
2 parents 8655825 + 65e8d27
commit a72ce69
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 5 deletions.
diff --git a/arch/arm/mach-tegra/board-dt-tegra20.c b/arch/arm/mach-tegra/board-dt-tegra20.c
@@ -37,7 +37,6 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/time.h>
 #include <asm/setup.h>
-#include <asm/hardware/gic.h>
 
 #include <mach/iomap.h>
 #include <mach/irqs.h>

diff --git 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