From: Tony Lindgren <tony@atomide.com>
Date: Wed, 13 Dec 2006 07:02:43 +0000 (-0800)
Subject: ARM: OMAP: Add missing header, fix gpmc header
X-Git-Tag: v2.6.21-omap1~116^2~28
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=9efa5c18bec4509566ab19f02abd31ef33f63234;p=linux-2.6-omap-h63xx.git

ARM: OMAP: Add missing header, fix gpmc header

Add missing header, fix gpmc header

Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c
index c48c0ac0a29..03065074f80 100644
--- a/arch/arm/mach-omap2/clock.c
+++ b/arch/arm/mach-omap2/clock.c
@@ -27,6 +27,7 @@
 
 #include <asm/arch/clock.h>
 #include <asm/arch/sram.h>
+#include <asm/div64.h>
 
 #include "prcm-regs.h"
 #include "memory.h"
diff --git a/include/asm-arm/arch-omap/gpmc.h b/include/asm-arm/arch-omap/gpmc.h
index c49b2622f68..434672df702 100644
--- a/include/asm-arm/arch-omap/gpmc.h
+++ b/include/asm-arm/arch-omap/gpmc.h
@@ -88,7 +88,7 @@ extern int gpmc_cs_calc_divider(int cs, unsigned int sync_clk);
 extern int gpmc_cs_set_timings(int cs, const struct gpmc_timings *t);
 extern int gpmc_cs_request(int cs, unsigned long size, unsigned long *base);
 extern void gpmc_cs_free(int cs);
-extern void gpmc_cs_set_reserved(int cs, int reserved);
+extern int gpmc_cs_set_reserved(int cs, int reserved);
 extern int gpmc_cs_reserved(int cs);
 
 #endif