From 441c745323070f88832b2e8fa85990c9e566cb30 Mon Sep 17 00:00:00 2001
From: Linus Walleij <linus.walleij@linaro.org>
Date: Mon, 13 Aug 2012 11:51:15 +0200
Subject: [PATCH] --- yaml --- r: 326417 b: refs/heads/master c:
 8dcf470760b74c41e7c93deebc2ff60af3908c97 h: refs/heads/master i:   326415:
 6c53ccac5472ea95fedae4e5188e10fe205decf5 v: v3

---
 [refs]                                                     | 2 +-
 trunk/arch/arm/mach-u300/core.c                            | 2 +-
 trunk/arch/arm/mach-u300/{include/mach => }/dma_channels.h | 0
 trunk/arch/arm/mach-u300/spi.c                             | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename trunk/arch/arm/mach-u300/{include/mach => }/dma_channels.h (100%)

diff --git a/[refs] b/[refs]
index 62f4e3a0bc5a..def4a06dc7b5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d0bc2f7d96e6d192f9840d10a68e30b2e69a04cd
+refs/heads/master: 8dcf470760b74c41e7c93deebc2ff60af3908c97
diff --git a/trunk/arch/arm/mach-u300/core.c b/trunk/arch/arm/mach-u300/core.c
index bc2339192fd9..31cc9267efc1 100644
--- a/trunk/arch/arm/mach-u300/core.c
+++ b/trunk/arch/arm/mach-u300/core.c
@@ -45,12 +45,12 @@
 #include <mach/coh901318.h>
 #include <mach/hardware.h>
 #include <mach/syscon.h>
-#include <mach/dma_channels.h>
 
 #include "timer.h"
 #include "spi.h"
 #include "i2c.h"
 #include "u300-gpio.h"
+#include "dma_channels.h"
 
 /*
  * Static I/O mappings that are needed for booting the U300 platforms. The
diff --git a/trunk/arch/arm/mach-u300/include/mach/dma_channels.h b/trunk/arch/arm/mach-u300/dma_channels.h
similarity index 100%
rename from trunk/arch/arm/mach-u300/include/mach/dma_channels.h
rename to trunk/arch/arm/mach-u300/dma_channels.h
diff --git a/trunk/arch/arm/mach-u300/spi.c b/trunk/arch/arm/mach-u300/spi.c
index a1affacfa59c..02e6659286d5 100644
--- a/trunk/arch/arm/mach-u300/spi.c
+++ b/trunk/arch/arm/mach-u300/spi.c
@@ -12,7 +12,7 @@
 #include <linux/amba/pl022.h>
 #include <linux/err.h>
 #include <mach/coh901318.h>
-#include <mach/dma_channels.h>
+#include "dma_channels.h"
 
 /*
  * The following is for the actual devices on the SSP/SPI bus