From 6ce9df79092cc7711c183b01cc1eec8fc5d7d210 Mon Sep 17 00:00:00 2001
From: Sachin Kamat <sachin.kamat@linaro.org>
Date: Thu, 12 Jul 2012 16:34:51 +0900
Subject: [PATCH] --- yaml --- r: 313201 b: refs/heads/master c:
 2a2b0e208ef57225cf0ce9b777749c11173483a1 h: refs/heads/master i:   313199:
 1d221ccb387786933e31fa2680362868dc6af4eb 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 75edda7138be..257b0160d8b5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c4c713554407a4afa2c1cadcc0f10e199742a4bc
+refs/heads/master: 2a2b0e208ef57225cf0ce9b777749c11173483a1
diff --git a/trunk/arch/arm/mach-exynos/common.c b/trunk/arch/arm/mach-exynos/common.c
index 742edd3bbec3..1b0922cda4ab 100644
--- a/trunk/arch/arm/mach-exynos/common.c
+++ b/trunk/arch/arm/mach-exynos/common.c
@@ -540,7 +540,8 @@ static struct irq_domain_ops combiner_irq_domain_ops = {
 	.map	= combiner_irq_domain_map,
 };
 
-void __init combiner_init(void __iomem *combiner_base, struct device_node *np)
+static void __init combiner_init(void __iomem *combiner_base,
+				 struct device_node *np)
 {
 	int i, irq, irq_base;
 	unsigned int max_nr, nr_irq;