From a158486f33d76d9fa085fcd0fd96d64cf0ae6173 Mon Sep 17 00:00:00 2001
From: Tony Lindgren <tony@atomide.com>
Date: Wed, 24 Oct 2012 15:05:45 -0700
Subject: [PATCH] --- yaml --- r: 339673 b: refs/heads/master c:
 6d02643d64b4440394ee462ea4b870c8506cd9e7 h: refs/heads/master i:   339671:
 8b565d36fce5c1035e644600b3fdab6569123cdd v: v3

---
 [refs]                                                          | 2 +-
 trunk/arch/arm/mach-omap2/board-h4.c                            | 2 +-
 trunk/arch/arm/mach-omap2/board-n8x0.c                          | 2 +-
 .../linux/mfd => arch/arm/plat-omap/include/plat}/menelaus.h    | 2 ++
 trunk/drivers/mfd/menelaus.c                                    | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)
 rename trunk/{include/linux/mfd => arch/arm/plat-omap/include/plat}/menelaus.h (96%)

diff --git a/[refs] b/[refs]
index 2dbf9bc0f714..22ded62f0045 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c97a189592fadaa928aa3e6c673e061823f1597
+refs/heads/master: 6d02643d64b4440394ee462ea4b870c8506cd9e7
diff --git a/trunk/arch/arm/mach-omap2/board-h4.c b/trunk/arch/arm/mach-omap2/board-h4.c
index bd11b0aa9495..366ebd93ae24 100644
--- a/trunk/arch/arm/mach-omap2/board-h4.c
+++ b/trunk/arch/arm/mach-omap2/board-h4.c
@@ -26,12 +26,12 @@
 #include <linux/clk.h>
 #include <linux/io.h>
 #include <linux/input/matrix_keypad.h>
-#include <linux/mfd/menelaus.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
+#include <plat/menelaus.h>
 #include <plat-omap/dma-omap.h>
 #include "debug-devices.h"
 
diff --git a/trunk/arch/arm/mach-omap2/board-n8x0.c b/trunk/arch/arm/mach-omap2/board-n8x0.c
index e3efcb88cb3b..cea433b9b7b9 100644
--- a/trunk/arch/arm/mach-omap2/board-n8x0.c
+++ b/trunk/arch/arm/mach-omap2/board-n8x0.c
@@ -22,13 +22,13 @@
 #include <linux/usb/musb.h>
 #include <linux/platform_data/spi-omap2-mcspi.h>
 #include <linux/platform_data/mtd-onenand-omap2.h>
-#include <linux/mfd/menelaus.h>
 #include <sound/tlv320aic3x.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach-types.h>
 
 #include "common.h"
+#include <plat/menelaus.h>
 #include "mmc.h"
 
 #include "mux.h"
diff --git a/trunk/include/linux/mfd/menelaus.h b/trunk/arch/arm/plat-omap/include/plat/menelaus.h
similarity index 96%
rename from trunk/include/linux/mfd/menelaus.h
rename to trunk/arch/arm/plat-omap/include/plat/menelaus.h
index f097e89134cb..4a970ec62dd1 100644
--- a/trunk/include/linux/mfd/menelaus.h
+++ b/trunk/arch/arm/plat-omap/include/plat/menelaus.h
@@ -1,4 +1,6 @@
 /*
+ * arch/arm/plat-omap/include/mach/menelaus.h
+ *
  * Functions to access Menelaus power management chip
  */
 
diff --git a/trunk/drivers/mfd/menelaus.c b/trunk/drivers/mfd/menelaus.c
index 998ce8cb3065..55d589981412 100644
--- a/trunk/drivers/mfd/menelaus.c
+++ b/trunk/drivers/mfd/menelaus.c
@@ -41,11 +41,11 @@
 #include <linux/rtc.h>
 #include <linux/bcd.h>
 #include <linux/slab.h>
-#include <linux/mfd/menelaus.h>
 
 #include <asm/mach/irq.h>
 
 #include <asm/gpio.h>
+#include <plat/menelaus.h>
 
 #define DRIVER_NAME			"menelaus"