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

Conflicts:
	arch/arm/mach-omap2/board-omap3logic.c
	arch/arm/mach-omap2/gpmc.c
	drivers/media/platform/omap/omap_vout.c
	drivers/media/platform/omap/omap_vout_vrfb.c

diff --cc arch/arm/mach-omap2/board-omap3logic.c
index 5cfade235bb468ed8ceb08f4e694f71c131fe461,cbcea420e332fbcfcf8c006ce426226bbcb880d2..6f58cad5bf740fadcda81925f754fd467625418b
--- 1/arch/arm/mach-omap2/board-omap3logic.c
--- 2/arch/arm/mach-omap2/board-omap3logic.c
+++ b/arch/arm/mach-omap2/board-omap3logic.c
@@@ -34,9 -34,8 +34,6 @@@
  #include <asm/mach/arch.h>
  #include <asm/mach/map.h>
  
--#include "gpmc-smsc911x.h"
- #include "gpmc.h"
- #include <plat/sdrc.h>
 -#include <plat/gpmc.h>
  #include <plat/usb.h>
  
  #include "common.h"
@@@ -44,6 -43,6 +41,8 @@@
  #include "hsmmc.h"
  #include "control.h"
  #include "common-board-devices.h"
++#include "gpmc.h"
++#include "gpmc-smsc911x.h"
  
  #define OMAP3LOGIC_SMSC911X_CS                        1
  

diff --cc arch/arm/mach-omap2/gpmc.c
index f14bd3f55218e5372d96e5f57226a75d66068b0c,e7f2b80721c491e2ee9730c51b50b16d07573731..9472541a4d8d36e87d8ef8b35535d531e345b66e
--- 1/arch/arm/mach-omap2/gpmc.c
--- 2/arch/arm/mach-omap2/gpmc.c
+++ b/arch/arm/mach-omap2/gpmc.c
@@@ -26,12 -26,11 +26,11 @@@
  #include <linux/interrupt.h>
  #include <linux/platform_device.h>
  
 +#include <linux/platform_data/mtd-nand-omap2.h>
 +
  #include <asm/mach-types.h>
 -#include <plat/gpmc.h>
  
  #include <plat/cpu.h>
- #include <plat/sdrc.h>
 -#include <plat/gpmc.h>
  #include <plat/omap_device.h>
  
  #include "soc.h"

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

diff --cc arch/arm/mach-omap2/pm34xx.c
index 001eff290cdb33b2f19c0f77d45500e0cda8cd45,ee0bffc614be43c65e584170b8f582c04dcc0687..bbe15cb1b8745c05ffebb2b502a3fb96c187c16c
--- 1/arch/arm/mach-omap2/pm34xx.c
--- 2/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
@@@ -38,9 -38,9 +38,8 @@@
  #include <plat/sram.h>
  #include "clockdomain.h"
  #include "powerdomain.h"
- #include <plat/sdrc.h>
  #include <plat/prcm.h>
 -#include <plat/gpmc.h>
 -#include <plat/dma.h>
 +#include <plat-omap/dma-omap.h>
  
  #include "common.h"
  #include "cm2xxx_3xxx.h"

diff --cc drivers/media/platform/omap/omap_vout.c
index 1bd6a2ec95a34ad6f2cac63220fd2b7de48fcab5,3ff94a30fde48615b4dc45a88960944cbcd3ae55..4b1becc86e54a77d6beea297b2128236992dd8bb
--- 1/drivers/media/platform/omap/omap_vout.c
--- 2/drivers/media/platform/omap/omap_vout.c
+++ b/drivers/media/platform/omap/omap_vout.c
@@@ -45,8 -45,8 +45,8 @@@
  #include <media/v4l2-ioctl.h>
  
  #include <plat/cpu.h>
 -#include <plat/dma.h>
 +#include <plat-omap/dma-omap.h>
- #include <plat/vrfb.h>
+ #include <video/omapvrfb.h>
  #include <video/omapdss.h>
  
  #include "omap_voutlib.h"

diff --cc drivers/media/platform/omap/omap_vout_vrfb.c
index bed4cbb18ef5bcedda459f93f81ce3d61e9d0edd,6c37f9240ddf19f090bb08976fd90dfd886f26f0..8340445a0ee597dfe65566d8924a1bcc482e385f
--- 1/drivers/media/platform/omap/omap_vout_vrfb.c
--- 2/drivers/media/platform/omap/omap_vout_vrfb.c
+++ b/drivers/media/platform/omap/omap_vout_vrfb.c
@@@ -16,8 -16,8 +16,8 @@@
  #include <media/videobuf-dma-contig.h>
  #include <media/v4l2-device.h>
  
 -#include <plat/dma.h>
 +#include <plat-omap/dma-omap.h>
- #include <plat/vrfb.h>
+ #include <video/omapvrfb.h>
  
  #include "omap_voutdef.h"
  #include "omap_voutlib.h"