Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 299063
b: refs/heads/master
c: cd1e6f9
h: refs/heads/master
i:
  299061: 463f8f3
  299059: cf5c4e8
  299055: a23e860
v: v3
  • Loading branch information
Tushar Behera authored and Linus Torvalds committed Apr 12, 2012
1 parent 3e2a798 commit 88e0b11
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 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: 3971dae51d7cccf4c8197786b050b3a65ace01f0
refs/heads/master: cd1e6f9e53e1a673a489826729709aaffa8ad621
8 changes: 4 additions & 4 deletions trunk/drivers/rtc/rtc-s3c.c
Original file line number Diff line number Diff line change
Expand Up @@ -667,16 +667,16 @@ static int s3c_rtc_resume(struct platform_device *pdev)
#ifdef CONFIG_OF
static const struct of_device_id s3c_rtc_dt_match[] = {
{
.compatible = "samsung,s3c2410-rtc"
.compatible = "samsung,s3c2410-rtc",
.data = TYPE_S3C2410,
}, {
.compatible = "samsung,s3c2416-rtc"
.compatible = "samsung,s3c2416-rtc",
.data = TYPE_S3C2416,
}, {
.compatible = "samsung,s3c2443-rtc"
.compatible = "samsung,s3c2443-rtc",
.data = TYPE_S3C2443,
}, {
.compatible = "samsung,s3c6410-rtc"
.compatible = "samsung,s3c6410-rtc",
.data = TYPE_S3C64XX,
},
{},
Expand Down

0 comments on commit 88e0b11

Please sign in to comment.