From 6506c06418d26d9b0e2804f9ed374862b7f37883 Mon Sep 17 00:00:00 2001
From: Sebastian Reichel <sre@debian.org>
Date: Tue, 31 May 2011 08:51:39 +0000
Subject: [PATCH] --- yaml --- r: 263657 b: refs/heads/master c:
 34d623d11316cb69f9e8cc5eb50d3792b5c302b6 h: refs/heads/master i:   263655:
 6a5968a6d21c70929bfda79d5fdf005d8a771ae8 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/rtc/rtc-twl.c | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index f667fc3c9d62..fe54f5c5daf1 100644
--- 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
index 1963cddbf214..9677bbc433f9 100644
--- 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;