Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / board-3430sdp-flash.c

diff --git a/arch/arm/mach-omap2/board-3430sdp-flash.c b/arch/arm/mach-omap2/board-3430sdp-flash.c
index acd576c3c3044ae34810b6416be9f91e4e150606..945a2ae520b60ccfc179d3b2a84b31b8291be323 100644 (file)
--- a/arch/arm/mach-omap2/board-3430sdp-flash.c
+++ b/arch/arm/mach-omap2/board-3430sdp-flash.c
@@ -21,9 +21,9 @@
 #include <linux/io.h>
 
 #include <asm/mach/flash.h>
-#include <asm/arch/onenand.h>
-#include <asm/arch/board.h>
-#include <asm/arch/gpmc.h>
+#include <mach/onenand.h>
+#include <mach/board.h>
+#include <mach/gpmc.h>
 
 static struct mtd_partition sdp_nor_partitions[] = {
        /* bootloader (U-Boot, etc) in first sector */
@@ -79,7 +79,7 @@ static struct platform_device sdp_nor_device = {
        .resource       = &sdp_nor_resource,
 };
 
-static int sdp_onenand_setup(void __iomem *);
+static int sdp_onenand_setup(void __iomem *, int freq);
 
 static struct mtd_partition sdp_onenand_partitions[] = {
        {
@@ -132,7 +132,7 @@ static struct platform_device sdp_onenand_device = {
  *
  * @return int:        Currently always returning zero.
  */
-static int sdp_onenand_setup(void __iomem *onenand_base)
+static int sdp_onenand_setup(void __iomem *onenand_base, int freq)
 {
        /* Onenand setup does nothing at present */
        return 0;