diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /drivers/rtc/rtc-lpc32xx.c | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'drivers/rtc/rtc-lpc32xx.c')
| -rw-r--r-- | drivers/rtc/rtc-lpc32xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-lpc32xx.c b/drivers/rtc/rtc-lpc32xx.c index ec8701ce99f9..ae16250c762f 100644 --- a/drivers/rtc/rtc-lpc32xx.c +++ b/drivers/rtc/rtc-lpc32xx.c | |||
| @@ -240,7 +240,7 @@ static int __devinit lpc32xx_rtc_probe(struct platform_device *pdev) | |||
| 240 | spin_lock_init(&rtc->lock); | 240 | spin_lock_init(&rtc->lock); |
| 241 | 241 | ||
| 242 | /* | 242 | /* |
| 243 | * The RTC is on a seperate power domain and can keep it's state | 243 | * The RTC is on a separate power domain and can keep it's state |
| 244 | * across a chip power cycle. If the RTC has never been previously | 244 | * across a chip power cycle. If the RTC has never been previously |
| 245 | * setup, then set it up now for the first time. | 245 | * setup, then set it up now for the first time. |
| 246 | */ | 246 | */ |