diff --git a/[refs] b/[refs]
index 77af62563f9b..4a649fb1d966 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 59bec58373bc8324a2ee7d7355fe8499c8f6f602
+refs/heads/master: ec3cdb5baedf6bb3852c531426c1e95a13671dff
diff --git a/trunk/arch/arm/mach-omap2/pm-debug.c b/trunk/arch/arm/mach-omap2/pm-debug.c
index 3d1cce280e24..3feb475bd14d 100644
--- a/trunk/arch/arm/mach-omap2/pm-debug.c
+++ b/trunk/arch/arm/mach-omap2/pm-debug.c
@@ -278,7 +278,7 @@ static int option_set(void *data, u64 val)
 
 DEFINE_SIMPLE_ATTRIBUTE(pm_dbg_option_fops, option_get, option_set, "%llu\n");
 
-static int pm_dbg_init(void)
+static int __init pm_dbg_init(void)
 {
 	struct dentry *d;