From: Tony Lindgren <tony@atomide.com>
Date: Wed, 17 Oct 2012 18:13:42 +0000 (-0700)
Subject: Merge branch 'omap-for-v3.8/cleanup-headers-mmc' into omap-for-v3.8/cleanup-headers
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=46cddc01aa6a017193ae7320ef8bfc8242782a66;p=linux.git

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
---

46cddc01aa6a017193ae7320ef8bfc8242782a66
diff --cc arch/arm/mach-omap1/devices.c
index 894e7c9b57f96,d807d949913d6..8e32d50d275be
--- a/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 92b19166aac82,f865ace5cf85b..cea433b9b7b9e
--- a/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 3c3a47317f8f5,f4b3c288e16b3..208a7a239db54
--- a/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_33xx_data.c
index f7f3c2dfa0af6,d023a99cfd7ac..44a661882a7e8
--- a/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 76ef2adc683ce,509e8ba3fe759..2aaf3ce80626a
--- a/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 5f59b16978ff7,f87d781c4ebbb..f47a57fa1f3a8
--- a/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 c59c4d25165c3,9f0e26fffaea7..ae115c01283b0
--- a/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