---

yaml --- r: 326417 b: refs/heads/master c: 8dcf470 h: refs/heads/master i: 326415: 6c53cca v: v3
git-mirror · Aug 13, 2012 · 441c745 · 441c745
1 parent 817f54e
commit 441c745
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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/...arm/mach-u300/include/mach/dma_channels.h → trunk/arch/arm/mach-u300/dma_channels.h b/...arm/mach-u300/include/mach/dma_channels.h → 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
@@ -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