Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 365791
b: refs/heads/master
c: 7d1376d
h: refs/heads/master
i:
  365789: c535824
  365787: 1df7404
  365783: 97ba964
  365775: 325a813
  365759: a9cb8d0
v: v3
  • Loading branch information
Jingoo Han authored and Linus Torvalds committed Apr 30, 2013
1 parent a4864a0 commit c7bef1e
Show file tree
Hide file tree
Showing 2 changed files with 3 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: e4ae909b34a0a8d799712146a97b6ae67445a49a
refs/heads/master: 7d1376d80228b4ca6e1a0d1e8b88efc23a013f2c
5 changes: 2 additions & 3 deletions trunk/drivers/rtc/rtc-tps80031.c
Original file line number Diff line number Diff line change
Expand Up @@ -323,9 +323,8 @@ static int tps80031_rtc_resume(struct device *dev)
};
#endif

static const struct dev_pm_ops tps80031_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(tps80031_rtc_suspend, tps80031_rtc_resume)
};
static SIMPLE_DEV_PM_OPS(tps80031_pm_ops, tps80031_rtc_suspend,
tps80031_rtc_resume);

static struct platform_driver tps80031_rtc_driver = {
.driver = {
Expand Down

0 comments on commit c7bef1e

Please sign in to comment.