From: Tony Lindgren <tony@atomide.com>
Date: Wed, 17 Oct 2012 17:01:30 +0000 (-0700)
Subject: Merge branch 'omap-for-v3.8/cleanup-headers-dma' into omap-for-v3.8/cleanup-headers
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=94c657853bd228ebbc2c590b7f81efcc1dde3329;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

Merge branch 'omap-for-v3.8/cleanup-headers-dma' into omap-for-v3.8/cleanup-headers

Conflicts:
	drivers/crypto/omap-aes.c
	drivers/crypto/omap-sham.c
	drivers/dma/omap-dma.c
---

94c657853bd228ebbc2c590b7f81efcc1dde3329
diff --cc drivers/crypto/omap-aes.c
index db3115d16cde,3e61febb8bb6..649a146e1382
--- a/drivers/crypto/omap-aes.c
+++ b/drivers/crypto/omap-aes.c
@@@ -29,7 -29,8 +29,7 @@@
  #include <crypto/scatterwalk.h>
  #include <crypto/aes.h>
  
- #include <plat/dma.h>
 -#include <plat/cpu.h>
+ #include <plat-omap/dma-omap.h>
  
  /* OMAP TRM gives bitfields as start:end, where start is the higher bit
     number. For example 7:0 */
diff --cc drivers/crypto/omap-sham.c
index f50387c4ef89,6d7969577143..d76fe06b9417
--- a/drivers/crypto/omap-sham.c
+++ b/drivers/crypto/omap-sham.c
@@@ -37,7 -37,8 +37,7 @@@
  #include <crypto/hash.h>
  #include <crypto/internal/hash.h>
  
- #include <plat/dma.h>
 -#include <plat/cpu.h>
+ #include <plat-omap/dma-omap.h>
  #include <mach/irqs.h>
  
  #define SHA_REG_DIGEST(x)		(0x00 + ((x) * 0x04))
diff --cc drivers/dma/omap-dma.c
index 30abe7b36aaa,0b4fa50537e6..56d925312a5c
--- a/drivers/dma/omap-dma.c
+++ b/drivers/dma/omap-dma.c
@@@ -19,14 -19,9 +19,14 @@@
  
  #include "virt-dma.h"
  
- #include <plat/dma.h>
 -#include <plat/cpu.h>
+ #include <plat-omap/dma-omap.h>
  
 +#ifdef CONFIG_ARCH_OMAP2PLUS
 +#define dma_omap2plus()	1
 +#else
 +#define dma_omap2plus()	0
 +#endif
 +
  struct omap_dmadev {
  	struct dma_device ddev;
  	spinlock_t lock;