diff options
| author | Olof Johansson <olof@lixom.net> | 2012-05-09 23:24:53 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-05-09 23:26:20 -0700 |
| commit | a72ce69097a2709bdbda34e2f77b8388a1323923 (patch) | |
| tree | 526ea58089c5b0df7873f7d86fa3e314ec848855 /arch | |
| parent | 86558257aa6716eda0ef6c94e0f579dc64fe95c3 (diff) | |
| parent | 65e8d272ba483dac3b5f724e938dda099e49a7e1 (diff) | |
| download | blackbird-obmc-linux-a72ce69097a2709bdbda34e2f77b8388a1323923.tar.gz blackbird-obmc-linux-a72ce69097a2709bdbda34e2f77b8388a1323923.zip | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-tegra/board-dt-tegra20.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/include/mach/dma.h | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/mach-tegra/board-dt-tegra20.c b/arch/arm/mach-tegra/board-dt-tegra20.c index 0952494f481a..72ae62003520 100644 --- 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 index 3c9339058bec..9077092812c0 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 |
