From 8edb0f8c0a685f448954dc48a3d572747445f95e Mon Sep 17 00:00:00 2001
From: Tony Lindgren <tony@atomide.com>
Date: Thu, 25 Oct 2012 12:21:48 -0700
Subject: [PATCH] --- yaml --- r: 339674 b: refs/heads/master c:
 2da8a79f7d81853d00b6a00621aeef7545196084 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 22ded62f0045..6a17a1c1ab5e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d02643d64b4440394ee462ea4b870c8506cd9e7
+refs/heads/master: 2da8a79f7d81853d00b6a00621aeef7545196084
diff --git a/trunk/arch/arm/mach-omap2/board-h4.c b/trunk/arch/arm/mach-omap2/board-h4.c
index 366ebd93ae24..bd11b0aa9495 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 cea433b9b7b9..e3efcb88cb3b 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/drivers/mfd/menelaus.c b/trunk/drivers/mfd/menelaus.c
index 55d589981412..998ce8cb3065 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"
 
diff --git a/trunk/arch/arm/plat-omap/include/plat/menelaus.h b/trunk/include/linux/mfd/menelaus.h
similarity index 96%
rename from trunk/arch/arm/plat-omap/include/plat/menelaus.h
rename to trunk/include/linux/mfd/menelaus.h
index 4a970ec62dd1..f097e89134cb 100644
--- a/trunk/arch/arm/plat-omap/include/plat/menelaus.h
+++ b/trunk/include/linux/mfd/menelaus.h
@@ -1,6 +1,4 @@
 /*
- * arch/arm/plat-omap/include/mach/menelaus.h
- *
  * Functions to access Menelaus power management chip
  */