From 8d9cc68307349aa93ccb7c23e4f15eae02accc13 Mon Sep 17 00:00:00 2001
From: Tony Lindgren <tony@atomide.com>
Date: Fri, 26 Oct 2012 13:32:22 -0700
Subject: [PATCH] --- yaml --- r: 339690 b: refs/heads/master c:
 7fc54fd3084457c7f11b9e2e1e3fcd19a3badc33 h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 trunk/arch/arm/mach-omap1/fpga.c              |  1 +
 trunk/arch/arm/mach-omap1/pm_bus.c            |  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 +-
 trunk/drivers/mtd/onenand/omap2.c             | 36 ++++++++++++-------
 .../plat => include/linux/mfd}/menelaus.h     |  2 --
 8 files changed, 31 insertions(+), 18 deletions(-)
 rename trunk/{arch/arm/plat-omap/include/plat => include/linux/mfd}/menelaus.h (96%)

diff --git a/[refs] b/[refs]
index a8d041504be9..e56da90d0576 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8634155ef41d3a035f2ea0b6c5bed2806f2788bc
+refs/heads/master: 7fc54fd3084457c7f11b9e2e1e3fcd19a3badc33
diff --git a/trunk/arch/arm/mach-omap1/fpga.c b/trunk/arch/arm/mach-omap1/fpga.c
index 4ec220d8da5c..d940fac9a9ed 100644
--- a/trunk/arch/arm/mach-omap1/fpga.c
+++ b/trunk/arch/arm/mach-omap1/fpga.c
@@ -32,6 +32,7 @@
 #include <mach/hardware.h>
 
 #include "iomap.h"
+#include "common.h"
 
 static void fpga_mask_irq(struct irq_data *d)
 {
diff --git a/trunk/arch/arm/mach-omap1/pm_bus.c b/trunk/arch/arm/mach-omap1/pm_bus.c
index 16bf2f95117c..3f2d39672393 100644
--- a/trunk/arch/arm/mach-omap1/pm_bus.c
+++ b/trunk/arch/arm/mach-omap1/pm_bus.c
@@ -19,6 +19,8 @@
 #include <linux/clk.h>
 #include <linux/err.h>
 
+#include "soc.h"
+
 #ifdef CONFIG_PM_RUNTIME
 static int omap1_pm_runtime_suspend(struct device *dev)
 {
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/drivers/mtd/onenand/omap2.c b/trunk/drivers/mtd/onenand/omap2.c
index 53069aef1f48..99f96e19ebea 100644
--- a/trunk/drivers/mtd/onenand/omap2.c
+++ b/trunk/drivers/mtd/onenand/omap2.c
@@ -445,13 +445,19 @@ static int omap3_onenand_write_bufferram(struct mtd_info *mtd, int area,
 
 #else
 
-int omap3_onenand_read_bufferram(struct mtd_info *mtd, int area,
-				 unsigned char *buffer, int offset,
-				 size_t count);
+static int omap3_onenand_read_bufferram(struct mtd_info *mtd, int area,
+					unsigned char *buffer, int offset,
+					size_t count)
+{
+	return -ENOSYS;
+}
 
-int omap3_onenand_write_bufferram(struct mtd_info *mtd, int area,
-				  const unsigned char *buffer,
-				  int offset, size_t count);
+static int omap3_onenand_write_bufferram(struct mtd_info *mtd, int area,
+					 const unsigned char *buffer,
+					 int offset, size_t count)
+{
+	return -ENOSYS;
+}
 
 #endif
 
@@ -549,13 +555,19 @@ static int omap2_onenand_write_bufferram(struct mtd_info *mtd, int area,
 
 #else
 
-int omap2_onenand_read_bufferram(struct mtd_info *mtd, int area,
-				 unsigned char *buffer, int offset,
-				 size_t count);
+static int omap2_onenand_read_bufferram(struct mtd_info *mtd, int area,
+					unsigned char *buffer, int offset,
+					size_t count)
+{
+	return -ENOSYS;
+}
 
-int omap2_onenand_write_bufferram(struct mtd_info *mtd, int area,
-				  const unsigned char *buffer,
-				  int offset, size_t count);
+static int omap2_onenand_write_bufferram(struct mtd_info *mtd, int area,
+					 const unsigned char *buffer,
+					 int offset, size_t count)
+{
+	return -ENOSYS;
+}
 
 #endif
 
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
  */