diff --git a/[refs] b/[refs]
index 3981ca1e441c..e712cfdc0cf5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b2fa3b7c602258c1ab9d1cb66c30d72e9085c762
+refs/heads/master: 2586ef0d1db6d606e5ceb7fbf97f34c8b402e90c
diff --git a/trunk/arch/arm/plat-omap/include/plat/gpmc.h b/trunk/arch/arm/plat-omap/include/plat/gpmc.h
index e081338e0b23..3f3609aa277f 100644
--- a/trunk/arch/arm/plat-omap/include/plat/gpmc.h
+++ b/trunk/arch/arm/plat-omap/include/plat/gpmc.h
@@ -110,6 +110,6 @@ extern void gpmc_prefetch_reset(void);
 extern int gpmc_prefetch_status(void);
 extern void omap3_gpmc_save_context(void);
 extern void omap3_gpmc_restore_context(void);
-extern void __init gpmc_init(void);
+extern void gpmc_init(void);
 
 #endif