Merge branch 'omap-for-v3.8/cleanup-headers-dss' into omap-for-v3.8/cleanup-headers
authorTony Lindgren <tony@atomide.com>
Wed, 17 Oct 2012 18:21:34 +0000 (11:21 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 17 Oct 2012 18:21:34 +0000 (11:21 -0700)
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

1  2 
arch/arm/mach-omap2/board-omap3logic.c
arch/arm/mach-omap2/gpmc.c
arch/arm/mach-omap2/io.c
arch/arm/mach-omap2/pm34xx.c
drivers/media/platform/omap/omap_vout.c
drivers/media/platform/omap/omap_vout_vrfb.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
  
  #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"
Simple merge
@@@ -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"
@@@ -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"
@@@ -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"