---

yaml --- r: 281870 b: refs/heads/master c: da82ce5 h: refs/heads/master v: v3
git-mirror · Dec 8, 2011 · 0ca838b · 0ca838b
1 parent 5c405c6
commit 0ca838b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 12 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e44f9a7744de8e39eda0f544171efc6e4b1ed91c
+refs/heads/master: da82ce57a45ac2f295415ed487b9aec051db4f7f
diff --git a/trunk/arch/arm/mach-omap2/common.h b/trunk/arch/arm/mach-omap2/common.h
@@ -158,17 +158,6 @@ void omap3_intc_resume_idle(void);
 void omap2_intc_handle_irq(struct pt_regs *regs);
 void omap3_intc_handle_irq(struct pt_regs *regs);
 
-/*
- * wfi used in low power code. Directly opcode is used instead
- * of instruction to avoid mulit-omap build break
- */
-#ifdef CONFIG_THUMB2_KERNEL
-#define do_wfi() __asm__ __volatile__ ("wfi" : : : "memory")
-#else
-#define do_wfi()			\
-		__asm__ __volatile__ (".word	0xe320f003" : : : "memory")
-#endif
-
 #ifdef CONFIG_CACHE_L2X0
 extern void __iomem *omap4_get_l2cache_base(void);
 #endif