---

yaml --- r: 355427 b: refs/heads/master c: 2b9277a h: refs/heads/master i: 355425: 03330f9 355423: fd32c67 v: v3
git-mirror · Jan 7, 2013 · d9addb9 · d9addb9
1 parent c0651db
commit d9addb9
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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/...ch/arm/mach-u300/include/mach/coh901318.h → trunk/drivers/dma/coh901318.h b/...ch/arm/mach-u300/include/mach/coh901318.h → 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
@@ -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
@@ -10,8 +10,6 @@
 #ifndef COH901318_LLI_H
 #define COH901318_LLI_H
 
-#include <mach/coh901318.h>
-
 struct device;
 
 struct coh901318_pool {