From abdd891650192b7f4f0c515cd287f8d8ff775c85 Mon Sep 17 00:00:00 2001
From: Felipe Balbi <felipe.balbi@nokia.com>
Date: Mon, 15 Feb 2010 10:03:33 -0800
Subject: [PATCH] --- yaml --- r: 184703 b: refs/heads/master c:
 b2fa3b7c602258c1ab9d1cb66c30d72e9085c762 h: refs/heads/master i:   184701:
 2db8442abe19eee53f1c3ecc35108ba73d5b7a8b   184699:
 dadf54dd50b7ab72f22a29a4800155eb924b3eb1   184695:
 f2cb32875c2218c8df75d3fc50300a9570fb4bb1   184687:
 ec5022ae2ac30bb67bce1794cd8040f16e366ae6   184671:
 eb69b157962828700b7a9b2551dd1873ba98f442   184639:
 15577a56c89f4b8ef6558a87c7873dc1dc78d2bf   184575:
 357d1eadd744ce24890babc1739f9dba8e27cf5a v: v3

---
 [refs]                           | 2 +-
 trunk/arch/arm/mach-omap2/gpmc.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f622875b42c9..3981ca1e441c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0cd7e1cc76c38b29ec459294750660855fa11ca8
+refs/heads/master: b2fa3b7c602258c1ab9d1cb66c30d72e9085c762
diff --git a/trunk/arch/arm/mach-omap2/gpmc.c b/trunk/arch/arm/mach-omap2/gpmc.c
index 7027cdc1ba49..5bc3ca03551c 100644
--- a/trunk/arch/arm/mach-omap2/gpmc.c
+++ b/trunk/arch/arm/mach-omap2/gpmc.c
@@ -552,9 +552,10 @@ void __init gpmc_init(void)
 #ifdef CONFIG_ARCH_OMAP3
 static struct omap3_gpmc_regs gpmc_context;
 
-void omap3_gpmc_save_context()
+void omap3_gpmc_save_context(void)
 {
 	int i;
+
 	gpmc_context.sysconfig = gpmc_read_reg(GPMC_SYSCONFIG);
 	gpmc_context.irqenable = gpmc_read_reg(GPMC_IRQENABLE);
 	gpmc_context.timeout_ctrl = gpmc_read_reg(GPMC_TIMEOUT_CONTROL);
@@ -583,9 +584,10 @@ void omap3_gpmc_save_context()
 	}
 }
 
-void omap3_gpmc_restore_context()
+void omap3_gpmc_restore_context(void)
 {
 	int i;
+
 	gpmc_write_reg(GPMC_SYSCONFIG, gpmc_context.sysconfig);
 	gpmc_write_reg(GPMC_IRQENABLE, gpmc_context.irqenable);
 	gpmc_write_reg(GPMC_TIMEOUT_CONTROL, gpmc_context.timeout_ctrl);