---

yaml --- r: 339673 b: refs/heads/master c: 6d02643 h: refs/heads/master i: 339671: 8b565d3 v: v3
git-mirror · Oct 24, 2012 · a158486 · a158486
1 parent d0a9759
commit a158486
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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 → ...rch/arm/plat-omap/include/plat/menelaus.h b/trunk/include/linux/mfd/menelaus.h → ...rch/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
@@ -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"