Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a72ce690 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'for-3.5/cleanup' of... 

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: default avatarOlof Johansson <olof@lixom.net>
parents 86558257 65e8d272

arch/arm/mach-tegra/board-dt-tegra20.c

+0 −1
Original line number Diff line number Diff line
@@ -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>

arch/arm/mach-tegra/include/mach/dma.h

+0 −4
Original line number Diff line number Diff line
@@ -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