Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 144871
b: refs/heads/master
c: f993004
h: refs/heads/master
i:
  144869: 765b7d0
  144867: deb821c
  144863: c34239a
v: v3
  • Loading branch information
Kim Kyuwon authored and Linus Torvalds committed May 12, 2009
1 parent 72fa4e8 commit 125d9f1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ecf4667d30dd63fa130e22f8f2da3e6ce003358b
refs/heads/master: f993004d73f266a02f3ac736fafb033c600972d9
4 changes: 1 addition & 3 deletions trunk/drivers/rtc/rtc-twl4030.c
Original file line number Diff line number Diff line change
Expand Up @@ -495,9 +495,7 @@ static int twl4030_rtc_suspend(struct platform_device *pdev, pm_message_t state)
{
irqstat = rtc_irq_bits;

/* REVISIT alarm may need to wake us from sleep */
mask_rtc_irq_bit(BIT_RTC_INTERRUPTS_REG_IT_TIMER_M |
BIT_RTC_INTERRUPTS_REG_IT_ALARM_M);
mask_rtc_irq_bit(BIT_RTC_INTERRUPTS_REG_IT_TIMER_M);
return 0;
}

Expand Down

0 comments on commit 125d9f1

Please sign in to comment.