Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 299068
b: refs/heads/master
c: 2f39721
h: refs/heads/master
v: v3
  • Loading branch information
Linus Walleij authored and Linus Torvalds committed Apr 12, 2012
1 parent 784ce4d commit d758c08
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 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: 41c93088127df2579e8ca64010929ec9e41d5543
refs/heads/master: 2f3972168353d355854d6381f1f360ce83b723e5
3 changes: 1 addition & 2 deletions trunk/drivers/rtc/rtc-pl031.c
Original file line number Diff line number Diff line change
Expand Up @@ -339,8 +339,7 @@ static int pl031_probe(struct amba_device *adev, const struct amba_id *id)
dev_dbg(&adev->dev, "revision = 0x%01x\n", ldata->hw_revision);

/* Enable the clockwatch on ST Variants */
if ((ldata->hw_designer == AMBA_VENDOR_ST) &&
(ldata->hw_revision > 1))
if (ldata->hw_designer == AMBA_VENDOR_ST)
writel(readl(ldata->base + RTC_CR) | RTC_CR_CWEN,
ldata->base + RTC_CR);

Expand Down

0 comments on commit d758c08

Please sign in to comment.