---

yaml --- r: 263657 b: refs/heads/master c: 34d623d h: refs/heads/master i: 263655: 6a5968a v: v3
git-mirror · Aug 10, 2011 · 6506c06 · 6506c06
1 parent d5ba3ae
commit 6506c06
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dec35d19c4ec65b94df3b27b6e373f0d48c9cd32
+refs/heads/master: 34d623d11316cb69f9e8cc5eb50d3792b5c302b6
diff --git a/trunk/drivers/rtc/rtc-twl.c b/trunk/drivers/rtc/rtc-twl.c
@@ -362,14 +362,6 @@ static irqreturn_t twl_rtc_interrupt(int irq, void *rtc)
 	int res;
 	u8 rd_reg;
 
-#ifdef CONFIG_LOCKDEP
-	/* WORKAROUND for lockdep forcing IRQF_DISABLED on us, which
-	 * we don't want and can't tolerate.  Although it might be
-	 * friendlier not to borrow this thread context...
-	 */
-	local_irq_enable();
-#endif
-
 	res = twl_rtc_read_u8(&rd_reg, REG_RTC_STATUS_REG);
 	if (res)
 		goto out;