diff --git a/[refs] b/[refs]
index d54fe718cb95..899d2976f25e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 84fee97a026ca085f08381054513f9e24689a303
+refs/heads/master: 59a98a1e56edea4d7d9c5f4ce9d50e271a04993c
diff --git a/trunk/arch/arm/kernel/perf_event.c b/trunk/arch/arm/kernel/perf_event.c
index c49e1701a2f6..35319b8e4d4b 100644
--- a/trunk/arch/arm/kernel/perf_event.c
+++ b/trunk/arch/arm/kernel/perf_event.c
@@ -1121,7 +1121,7 @@ armv6pmu_start(void)
 	spin_unlock_irqrestore(&pmu_lock, flags);
 }
 
-void
+static void
 armv6pmu_stop(void)
 {
 	unsigned long flags, val;