From: Olof Johansson <olof@lixom.net>
Date: Mon, 5 Nov 2012 18:28:21 +0000 (-0800)
Subject: Merge branch 'depends/omap-cleanup-headers-menelaus' into next/headers
X-Git-Tag: v3.8-rc1~145^2~6
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6c97a189592fadaa928aa3e6c673e061823f1597;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'depends/omap-cleanup-headers-menelaus' into next/headers

Again, resolve conflicts identical to how Tony did.

Conflicts:
	arch/arm/mach-omap2/board-h4.c
	arch/arm/mach-omap2/board-n8x0.c

Signed-off-by: Olof Johansson <olof@lixom.net>
---

6c97a189592fadaa928aa3e6c673e061823f1597
diff --cc arch/arm/mach-omap2/board-h4.c
index 366ebd93ae24,3977a0276b4c..bd11b0aa9495
--- a/arch/arm/mach-omap2/board-h4.c
+++ b/arch/arm/mach-omap2/board-h4.c
@@@ -31,8 -32,8 +32,7 @@@
  #include <asm/mach/arch.h>
  #include <asm/mach/map.h>
  
- #include <plat/menelaus.h>
 -#include <plat/dma.h>
 -#include <plat/gpmc.h>
 +#include <plat-omap/dma-omap.h>
  #include "debug-devices.h"
  
  #include <video/omapdss.h>
diff --cc arch/arm/mach-omap2/board-n8x0.c
index cea433b9b7b9,e3e8325054b2..e3efcb88cb3b
--- a/arch/arm/mach-omap2/board-n8x0.c
+++ b/arch/arm/mach-omap2/board-n8x0.c
@@@ -28,11 -29,9 +29,10 @@@
  #include <asm/mach-types.h>
  
  #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