From 781a26dd7a644975f4c416af8f60bdbf898e68f9 Mon Sep 17 00:00:00 2001
From: Rabin Vincent <rabin@rab.in>
Date: Sat, 14 Apr 2012 21:51:32 +0100
Subject: [PATCH] --- yaml --- r: 299277 b: refs/heads/master c:
 708e5978dfee0090a27c5531ce3b017dd6d190a2 h: refs/heads/master i:   299275:
 8d4f41149a2d77e879fc083f974ea15f4e935065 v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/arm/include/asm/jump_label.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0b4cc5ba129f..3a28044bd03f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 078c04545ba56da21567728a909a496df5ff730d
+refs/heads/master: 708e5978dfee0090a27c5531ce3b017dd6d190a2
diff --git a/trunk/arch/arm/include/asm/jump_label.h b/trunk/arch/arm/include/asm/jump_label.h
index 5c5ca2ea62b0..bfc198c75913 100644
--- a/trunk/arch/arm/include/asm/jump_label.h
+++ b/trunk/arch/arm/include/asm/jump_label.h
@@ -14,7 +14,7 @@
 #define JUMP_LABEL_NOP	"nop"
 #endif
 
-static __always_inline bool arch_static_branch(struct jump_label_key *key)
+static __always_inline bool arch_static_branch(struct static_key *key)
 {
 	asm goto("1:\n\t"
 		 JUMP_LABEL_NOP "\n\t"