From 201bf60a3651dbe4047c13fef3c20ca1b985a854 Mon Sep 17 00:00:00 2001
From: Rabin Vincent <rabin@rab.in>
Date: Wed, 12 Jan 2011 14:38:52 +0100
Subject: [PATCH] --- yaml --- r: 231291 b: refs/heads/master c:
 e163d529ad7ab449db36ee88dab16170de711f34 h: refs/heads/master i:   231289:
 0ec77b74716eaa37f15f6734f10100aa08f9e97e   231287:
 065553fc6ba020255dbddadf1fe3ad4ef722dca4 v: v3

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

diff --git a/[refs] b/[refs]
index e94a219e66ff..54f38529ed5f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22eeb8f6e0214a83ac6958a29a83572137f174bb
+refs/heads/master: e163d529ad7ab449db36ee88dab16170de711f34
diff --git a/trunk/arch/arm/include/asm/bitops.h b/trunk/arch/arm/include/asm/bitops.h
index 338ff19ae447..7b1bb2bbaf88 100644
--- a/trunk/arch/arm/include/asm/bitops.h
+++ b/trunk/arch/arm/include/asm/bitops.h
@@ -285,7 +285,7 @@ static inline int fls(int x)
 	if (__builtin_constant_p(x))
 	       return constant_fls(x);
 
-	asm("clz\t%0, %1" : "=r" (ret) : "r" (x) : "cc");
+	asm("clz\t%0, %1" : "=r" (ret) : "r" (x));
        	ret = 32 - ret;
 	return ret;
 }