diff --git a/[refs] b/[refs]
index 30a4ab1751ed..c1cc4c0ba054 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 778d02e9b3b7188ce37ff542e54ff5df723659e6
+refs/heads/master: 7548c09a475039b5e9179615ac4c1c58b930cdb5
diff --git a/trunk/arch/arm/mach-omap2/hwspinlock.c b/trunk/arch/arm/mach-omap2/hwspinlock.c
index 454dfce125ca..8763c8520dc2 100644
--- a/trunk/arch/arm/mach-omap2/hwspinlock.c
+++ b/trunk/arch/arm/mach-omap2/hwspinlock.c
@@ -28,7 +28,7 @@ static struct hwspinlock_pdata omap_hwspinlock_pdata __initdata = {
 	.base_id = 0,
 };
 
-int __init hwspinlocks_init(void)
+static int __init hwspinlocks_init(void)
 {
 	int retval = 0;
 	struct omap_hwmod *oh;