summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/apbio.c
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2012-10-04 14:24:09 -0600
committerStephen Warren <swarren@nvidia.com>2012-11-05 11:36:06 -0700
commit2be39c079d692a07b55c8795051d40c0c94a3633 (patch)
tree95cc043a17547f826e7d8b97b6383d12ce5318d7 /arch/arm/mach-tegra/apbio.c
parent8a5d51fda0facccdfc13f6048520604e05b62732 (diff)
ARM: tegra: move iomap.h to mach-tegra
Nothing outside mach-tegra uses this file, so there's no need for it to be in <mach/>. Since uncompress.h and debug-macro.S remain in include/mach, they need to include "../../iomap.h" becaue of this change. uncompress.h will soon be deleted in later multi-platform/single-zImage patches. debug-macro.S will need to continue to include this header using an explicit relative path, to avoid duplicating the physical->virtual address mapping that iomap.h dictates. Signed-off-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/apbio.c')
-rw-r--r--arch/arm/mach-tegra/apbio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/apbio.c b/arch/arm/mach-tegra/apbio.c
index bc949fb7efe8..d091675ba376 100644
--- a/arch/arm/mach-tegra/apbio.c
+++ b/arch/arm/mach-tegra/apbio.c
@@ -15,7 +15,6 @@
#include <linux/kernel.h>
#include <linux/io.h>
-#include <mach/iomap.h>
#include <linux/of.h>
#include <linux/dmaengine.h>
#include <linux/dma-mapping.h>
@@ -25,6 +24,7 @@
#include <linux/mutex.h>
#include "apbio.h"
+#include "iomap.h"
#if defined(CONFIG_TEGRA20_APB_DMA)
static DEFINE_MUTEX(tegra_apb_dma_lock);