From d9addb9c3e7f15b8d0449ca95558720d03cf0c2c Mon Sep 17 00:00:00 2001
From: Linus Walleij <linus.walleij@linaro.org>
Date: Fri, 4 Jan 2013 13:56:16 +0100
Subject: [PATCH] --- yaml --- r: 355427 b: refs/heads/master c:
 2b9277ad77e2b14a6bb113cc6c0da5101abc5261 h: refs/heads/master i:   355425:
 03330f93dee1fc36d0d529196c829ab66bec2737   355423:
 fd32c67e9e33600e860aeea5d667933d61972330 v: v3

---
 [refs]                                                      | 2 +-
 trunk/arch/arm/mach-u300/core.c                             | 1 -
 trunk/arch/arm/mach-u300/spi.c                              | 1 -
 trunk/drivers/dma/coh901318.c                               | 2 +-
 .../arm/mach-u300/include/mach => drivers/dma}/coh901318.h  | 6 +-----
 trunk/drivers/dma/coh901318_lli.c                           | 2 +-
 trunk/drivers/dma/coh901318_lli.h                           | 2 --
 7 files changed, 4 insertions(+), 12 deletions(-)
 rename trunk/{arch/arm/mach-u300/include/mach => drivers/dma}/coh901318.h (99%)

diff --git a/[refs] b/[refs]
index 4ec0dc9f7a5e..3b8c1ded5469 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9aab4d6f087a042d702b6e16346378731eeaf48e
+refs/heads/master: 2b9277ad77e2b14a6bb113cc6c0da5101abc5261
diff --git a/trunk/arch/arm/mach-u300/core.c b/trunk/arch/arm/mach-u300/core.c
index 834d0bd2aa0f..19f5c5311f47 100644
--- a/trunk/arch/arm/mach-u300/core.c
+++ b/trunk/arch/arm/mach-u300/core.c
@@ -41,7 +41,6 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
-#include <mach/coh901318.h>
 #include <mach/hardware.h>
 #include <mach/syscon.h>
 #include <mach/irqs.h>
diff --git a/trunk/arch/arm/mach-u300/spi.c b/trunk/arch/arm/mach-u300/spi.c
index b34567f944ca..910698293d64 100644
--- a/trunk/arch/arm/mach-u300/spi.c
+++ b/trunk/arch/arm/mach-u300/spi.c
@@ -12,7 +12,6 @@
 #include <linux/amba/pl022.h>
 #include <linux/platform_data/dma-coh901318.h>
 #include <linux/err.h>
-#include <mach/coh901318.h>
 
 /*
  * The following is for the actual devices on the SSP/SPI bus
diff --git a/trunk/drivers/dma/coh901318.c b/trunk/drivers/dma/coh901318.c
index 7fa54fb7ab68..1be69b87a913 100644
--- a/trunk/drivers/dma/coh901318.c
+++ b/trunk/drivers/dma/coh901318.c
@@ -22,8 +22,8 @@
 #include <linux/uaccess.h>
 #include <linux/debugfs.h>
 #include <linux/platform_data/dma-coh901318.h>
-#include <mach/coh901318.h>
 
+#include "coh901318.h"
 #include "coh901318_lli.h"
 #include "dmaengine.h"
 
diff --git a/trunk/arch/arm/mach-u300/include/mach/coh901318.h b/trunk/drivers/dma/coh901318.h
similarity index 99%
rename from trunk/arch/arm/mach-u300/include/mach/coh901318.h
rename to trunk/drivers/dma/coh901318.h
index 185fc59fd729..9353c40b152a 100644
--- a/trunk/arch/arm/mach-u300/include/mach/coh901318.h
+++ b/trunk/drivers/dma/coh901318.h
@@ -1,9 +1,5 @@
 /*
- *
- * include/linux/coh901318.h
- *
- *
- * Copyright (C) 2007-2009 ST-Ericsson
+ * Copyright (C) 2007-2013 ST-Ericsson
  * License terms: GNU General Public License (GPL) version 2
  * DMA driver for COH 901 318
  * Author: Per Friden <per.friden@stericsson.com>
diff --git a/trunk/drivers/dma/coh901318_lli.c b/trunk/drivers/dma/coh901318_lli.c
index 780e0429b38c..e25cac0af3f6 100644
--- a/trunk/drivers/dma/coh901318_lli.c
+++ b/trunk/drivers/dma/coh901318_lli.c
@@ -11,8 +11,8 @@
 #include <linux/memory.h>
 #include <linux/gfp.h>
 #include <linux/dmapool.h>
-#include <mach/coh901318.h>
 
+#include "coh901318.h"
 #include "coh901318_lli.h"
 
 #if (defined(CONFIG_DEBUG_FS) && defined(CONFIG_U300_DEBUG))
diff --git a/trunk/drivers/dma/coh901318_lli.h b/trunk/drivers/dma/coh901318_lli.h
index abff3714fdda..0c7caceef63b 100644
--- a/trunk/drivers/dma/coh901318_lli.h
+++ b/trunk/drivers/dma/coh901318_lli.h
@@ -10,8 +10,6 @@
 #ifndef COH901318_LLI_H
 #define COH901318_LLI_H
 
-#include <mach/coh901318.h>
-
 struct device;
 
 struct coh901318_pool {