diff --git a/[refs] b/[refs]
index 632ab0264715..9aa16313a8a3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 896f361bd291f34e0ef439c249b79d7c51ed3f9a
+refs/heads/master: ae7a49666af427da745e69a39fcfdd3a8b4ab3e8
diff --git a/trunk/include/asm-arm26/system.h b/trunk/include/asm-arm26/system.h
index ca4ccfc4b578..71b89c4a3c32 100644
--- a/trunk/include/asm-arm26/system.h
+++ b/trunk/include/asm-arm26/system.h
@@ -100,7 +100,6 @@ extern unsigned int user_debug;
  */
 #define prepare_arch_switch(rq,next)	local_irq_enable()
 #define finish_arch_switch(rq,prev)	spin_unlock(&(rq)->lock)
-#define task_running(rq,p)		((rq)->curr == (p))
 
 /*
  * switch_to(prev, next) should switch from task `prev' to `next'