From 8ca454cdc440041e65591a0cac35e7f8b407e885 Mon Sep 17 00:00:00 2001
From: Sachin Kamat <sachin.kamat@linaro.org>
Date: Thu, 8 Nov 2012 09:22:08 +0900
Subject: [PATCH] --- yaml --- r: 339841 b: refs/heads/master c:
 96046ea38e8f6caee12e44bd9c4f699ae2832080 h: refs/heads/master i:   339839:
 f54353621b1b62d9692929723351c384037aa446 v: v3

---
 [refs]                              | 2 +-
 trunk/arch/arm/mach-exynos/common.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ac27289bef30..09a5c42e0dc5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 62ef4a5d7a33852b54798dd738f675ac746f0d4c
+refs/heads/master: 96046ea38e8f6caee12e44bd9c4f699ae2832080
diff --git a/trunk/arch/arm/mach-exynos/common.c b/trunk/arch/arm/mach-exynos/common.c
index 4e577f6e6164..5b35d7168f3c 100644
--- a/trunk/arch/arm/mach-exynos/common.c
+++ b/trunk/arch/arm/mach-exynos/common.c
@@ -573,7 +573,8 @@ static void __init combiner_init(void __iomem *combiner_base,
 }
 
 #ifdef CONFIG_OF
-int __init combiner_of_init(struct device_node *np, struct device_node *parent)
+static int __init combiner_of_init(struct device_node *np,
+				   struct device_node *parent)
 {
 	void __iomem *combiner_base;