diff options
author | Todd Poynor <toddpoynor@google.com> | 2012-04-30 15:36:56 -0700 |
---|---|---|
committer | Todd Poynor <toddpoynor@google.com> | 2012-04-30 15:36:56 -0700 |
commit | 5c15664a86e18352ccdc2f501907725caa9ab73d (patch) | |
tree | f8289ea774881961a44d904a3f41f4c17b8facf3 /drivers/rtc | |
parent | 80b8354d535d2e8d6ced0b0e129257dba1fb2130 (diff) | |
parent | f1c84a5cb52ee2915457b481c756fcc1dfe6a471 (diff) | |
download | kernel_samsung_aries-5c15664a86e18352ccdc2f501907725caa9ab73d.zip kernel_samsung_aries-5c15664a86e18352ccdc2f501907725caa9ab73d.tar.gz kernel_samsung_aries-5c15664a86e18352ccdc2f501907725caa9ab73d.tar.bz2 |
Merge commit 'v3.0.30' into android-3.0
Diffstat (limited to 'drivers/rtc')
-rw-r--r-- | drivers/rtc/rtc-pl031.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/rtc/rtc-pl031.c b/drivers/rtc/rtc-pl031.c index ff1b84b..e86edfc 100644 --- a/drivers/rtc/rtc-pl031.c +++ b/drivers/rtc/rtc-pl031.c @@ -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); |