Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 308999
b: refs/heads/master
c: ecb41a7
h: refs/heads/master
i:
  308997: c8cd9db
  308995: 89e5dc4
  308991: 0cc79fc
v: v3
  • Loading branch information
Sachin Kamat authored and Linus Torvalds committed May 29, 2012
1 parent 3d372eb commit 7c986b6
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 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: 621bae79f1a250e443eb83d1f473c533bea493dc
refs/heads/master: ecb41a77411358d385e3fde5b4e98a5f3d9cfdd5
2 changes: 1 addition & 1 deletion trunk/drivers/rtc/rtc-s3c.c
Original file line number Diff line number Diff line change
Expand Up @@ -670,14 +670,14 @@ static int s3c_rtc_resume(struct platform_device *pdev)
#define s3c_rtc_resume NULL
#endif

#ifdef CONFIG_OF
static struct s3c_rtc_drv_data s3c_rtc_drv_data_array[] = {
[TYPE_S3C2410] = { TYPE_S3C2410 },
[TYPE_S3C2416] = { TYPE_S3C2416 },
[TYPE_S3C2443] = { TYPE_S3C2443 },
[TYPE_S3C64XX] = { TYPE_S3C64XX },
};

#ifdef CONFIG_OF
static const struct of_device_id s3c_rtc_dt_match[] = {
{
.compatible = "samsung,s3c2410-rtc",
Expand Down

0 comments on commit 7c986b6

Please sign in to comment.