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

Conflicts:
	arch/arm/mach-omap1/devices.c
	arch/arm/mach-omap2/omap_hwmod_33xx_data.c
	arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
	drivers/mmc/host/omap.c

diff --cc arch/arm/mach-omap1/devices.c
index 894e7c9b57f9627f5a1458f4486e4c9d2d0901d4,d807d949913d697f98f4c572f87e8a3ba81749d0..8e32d50d275be7e58399006a3f1ceaa7d95c9701
--- 1/arch/arm/mach-omap1/devices.c
--- 2/arch/arm/mach-omap1/devices.c
+++ b/arch/arm/mach-omap1/devices.c
@@@ -21,7 -21,7 +21,6 @@@
  
  #include <plat/tc.h>
  #include <mach/mux.h>
- #include <plat/mmc.h>
 -#include <plat/dma.h>
  
  #include <mach/omap7xx.h>
  #include <mach/camera.h>
@@@ -29,7 -29,7 +28,8 @@@
  
  #include "common.h"
  #include "clock.h"
 +#include "dma.h"
+ #include "mmc.h"
  
  #if defined(CONFIG_SND_SOC) || defined(CONFIG_SND_SOC_MODULE)
  

diff --cc arch/arm/mach-omap2/board-n8x0.c
index 92b19166aac82ee4f3613d1b39f17429cbfe395f,f865ace5cf85bc0cc4dc81e2412fa15ede944cf2..cea433b9b7b9ede2a8be9d94e1da733259b9e4d1
--- 1/arch/arm/mach-omap2/board-n8x0.c
--- 2/arch/arm/mach-omap2/board-n8x0.c
+++ b/arch/arm/mach-omap2/board-n8x0.c
@@@ -29,10 -29,9 +29,10 @@@
  
  #include "common.h"
  #include <plat/menelaus.h>
- #include <plat/mmc.h>
+ #include "mmc.h"
  
  #include "mux.h"
 +#include "gpmc-onenand.h"
  
  #define TUSB6010_ASYNC_CS     1
  #define TUSB6010_SYNC_CS      4

diff --cc arch/arm/mach-omap2/board-rm680.c
index 3c3a47317f8f5ddf3c6708d7e8adaf4cc703623a,f4b3c288e16b3b7dacfc04d0c1dce93448aec748..208a7a239db54470bdaffb67c4591a9babeaddef
--- 1/arch/arm/mach-omap2/board-rm680.c
--- 2/arch/arm/mach-omap2/board-rm680.c
+++ b/arch/arm/mach-omap2/board-rm680.c
@@@ -23,9 -23,8 +23,8 @@@
  #include <asm/mach-types.h>
  
  #include <plat/i2c.h>
- #include <plat/mmc.h>
  #include <plat/usb.h>
 -#include <plat/gpmc.h>
 +#include "gpmc.h"
  #include "common.h"
  #include <plat/serial.h>
  

diff --cc arch/arm/mach-omap2/omap_hwmod_2420_data.c
Simple merge

diff --cc arch/arm/mach-omap2/omap_hwmod_2430_data.c
Simple merge

diff --cc arch/arm/mach-omap2/omap_hwmod_33xx_data.c
index f7f3c2dfa0af69016268a4773d14592a95dc2429,d023a99cfd7ac2371485662aea9bb778387fb84a..44a661882a7e8e5cae74157a970823d718c32e41
--- 1/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
--- 2/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
@@@ -18,8 -18,7 +18,6 @@@
  #include <plat/cpu.h>
  #include <linux/platform_data/gpio-omap.h>
  #include <linux/platform_data/spi-omap2-mcspi.h>
- #include <plat-omap/dma-omap.h>
- #include <plat/mmc.h>
 -#include <plat/dma.h>
  #include <plat/i2c.h>
  
  #include "omap_hwmod_common_data.h"

diff --cc arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index 76ef2adc683cea49967ae21714511250d1621509,509e8ba3fe7597aa2e6c8284226801e2ca1d5b7a..2aaf3ce80626ac7f402b493ccde13f52176bb7ac
--- 1/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
--- 2/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@@ -35,8 -34,7 +34,9 @@@
  #include "omap_hwmod_common_data.h"
  #include "prm-regbits-34xx.h"
  #include "cm-regbits-34xx.h"
 +
 +#include "dma.h"
+ #include "mmc.h"
  #include "wd_timer.h"
  
  /*

diff --cc arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index 5f59b16978ff7dae3a5ef96fef007058f03f3ddf,f87d781c4ebbbbf29fd2059c60a264ff68b4e62f..f47a57fa1f3a8a6509a3af8beeb55daa639d3c8f
--- 1/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
--- 2/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@@ -24,10 -24,9 +24,9 @@@
  
  #include <plat/omap_hwmod.h>
  #include <plat/i2c.h>
 -#include <plat/dma.h>
 +#include <plat-omap/dma-omap.h>
  #include <linux/platform_data/spi-omap2-mcspi.h>
  #include <linux/platform_data/asoc-ti-mcbsp.h>
- #include <plat/mmc.h>
  #include <plat/dmtimer.h>
  #include <plat/common.h>
  #include <plat/iommu.h>

diff --cc drivers/mmc/host/omap.c
index c59c4d25165c3c1487d64c82ddb0f3c80d884543,9f0e26fffaea7021761530529aaa0be2844fb9a7..ae115c01283b0c9a426bf8f73bb47e9f7741882f
--- 1/drivers/mmc/host/omap.c
--- 2/drivers/mmc/host/omap.c
+++ b/drivers/mmc/host/omap.c
@@@ -28,9 -28,9 +28,8 @@@
  #include <linux/clk.h>
  #include <linux/scatterlist.h>
  #include <linux/slab.h>
+ #include <linux/platform_data/mmc-omap.h>
  
- #include <plat/mmc.h>
- #include <plat-omap/dma-omap.h>
 -#include <plat/dma.h>
  
  #define       OMAP_MMC_REG_CMD        0x00
  #define       OMAP_MMC_REG_ARGL       0x01