From 8d32dcf44612a7f4f0cdef338bf42f8b60ceb477 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 2 Mar 2012 12:25:37 +0000
Subject: [PATCH] --- yaml --- r: 303059 b: refs/heads/master c:
 65e8d272ba483dac3b5f724e938dda099e49a7e1 h: refs/heads/master i:   303057:
 e26143c400622d5c691367a0fa904ab49840fe4d   303055:
 8fe58c20c81fa3f03c88f38910e9ea414a8b7008 v: v3

---
 [refs]                                       | 2 +-
 trunk/arch/arm/mach-tegra/include/mach/dma.h | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 2a61a48acfe6..99e3e247a888 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb75bb7a0e0ed6077ea45f2692526283e1087737
+refs/heads/master: 65e8d272ba483dac3b5f724e938dda099e49a7e1
diff --git a/trunk/arch/arm/mach-tegra/include/mach/dma.h b/trunk/arch/arm/mach-tegra/include/mach/dma.h
index 3c9339058bec..9077092812c0 100644
--- a/trunk/arch/arm/mach-tegra/include/mach/dma.h
+++ b/trunk/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