diff options
author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/rtc | |
parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/rtc')
-rw-r--r-- | drivers/rtc/rtc-ds1511.c | 4 | ||||
-rw-r--r-- | drivers/rtc/rtc-stk17ta8.c | 2 | ||||
-rw-r--r-- | drivers/rtc/rtc-v3020.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/rtc/rtc-ds1511.c b/drivers/rtc/rtc-ds1511.c index 0b6b7730c716..539676e25fd8 100644 --- a/drivers/rtc/rtc-ds1511.c +++ b/drivers/rtc/rtc-ds1511.c | |||
@@ -2,7 +2,7 @@ | |||
2 | * An rtc driver for the Dallas DS1511 | 2 | * An rtc driver for the Dallas DS1511 |
3 | * | 3 | * |
4 | * Copyright (C) 2006 Atsushi Nemoto <anemo@mba.ocn.ne.jp> | 4 | * Copyright (C) 2006 Atsushi Nemoto <anemo@mba.ocn.ne.jp> |
5 | * Copyright (C) 2007 Andrew Sharp <andy.sharp@onstor.com> | 5 | * Copyright (C) 2007 Andrew Sharp <andy.sharp@lsi.com> |
6 | * | 6 | * |
7 | * This program is free software; you can redistribute it and/or modify | 7 | * This program is free software; you can redistribute it and/or modify |
8 | * it under the terms of the GNU General Public License version 2 as | 8 | * it under the terms of the GNU General Public License version 2 as |
@@ -636,7 +636,7 @@ ds1511_rtc_exit(void) | |||
636 | module_init(ds1511_rtc_init); | 636 | module_init(ds1511_rtc_init); |
637 | module_exit(ds1511_rtc_exit); | 637 | module_exit(ds1511_rtc_exit); |
638 | 638 | ||
639 | MODULE_AUTHOR("Andrew Sharp <andy.sharp@onstor.com>"); | 639 | MODULE_AUTHOR("Andrew Sharp <andy.sharp@lsi.com>"); |
640 | MODULE_DESCRIPTION("Dallas DS1511 RTC driver"); | 640 | MODULE_DESCRIPTION("Dallas DS1511 RTC driver"); |
641 | MODULE_LICENSE("GPL"); | 641 | MODULE_LICENSE("GPL"); |
642 | MODULE_VERSION(DRV_VERSION); | 642 | MODULE_VERSION(DRV_VERSION); |
diff --git a/drivers/rtc/rtc-stk17ta8.c b/drivers/rtc/rtc-stk17ta8.c index 7d1547b0070e..d491eb265c38 100644 --- a/drivers/rtc/rtc-stk17ta8.c +++ b/drivers/rtc/rtc-stk17ta8.c | |||
@@ -286,7 +286,7 @@ static struct bin_attribute stk17ta8_nvram_attr = { | |||
286 | .write = stk17ta8_nvram_write, | 286 | .write = stk17ta8_nvram_write, |
287 | }; | 287 | }; |
288 | 288 | ||
289 | static int __init stk17ta8_rtc_probe(struct platform_device *pdev) | 289 | static int __devinit stk17ta8_rtc_probe(struct platform_device *pdev) |
290 | { | 290 | { |
291 | struct rtc_device *rtc; | 291 | struct rtc_device *rtc; |
292 | struct resource *res; | 292 | struct resource *res; |
diff --git a/drivers/rtc/rtc-v3020.c b/drivers/rtc/rtc-v3020.c index 423cd5a30b10..ad741afd47d8 100644 --- a/drivers/rtc/rtc-v3020.c +++ b/drivers/rtc/rtc-v3020.c | |||
@@ -335,7 +335,7 @@ static int rtc_probe(struct platform_device *pdev) | |||
335 | goto err_io; | 335 | goto err_io; |
336 | } | 336 | } |
337 | 337 | ||
338 | /* Make sure frequency measurment mode, test modes, and lock | 338 | /* Make sure frequency measurement mode, test modes, and lock |
339 | * are all disabled */ | 339 | * are all disabled */ |
340 | v3020_set_reg(chip, V3020_STATUS_0, 0x0); | 340 | v3020_set_reg(chip, V3020_STATUS_0, 0x0); |
341 | 341 | ||