diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-21 05:21:15 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-21 05:21:15 -0500 |
| commit | de8853bc38ceab1fa7e7f723b21430d4aad60fea (patch) | |
| tree | 5084ef51866fd1767324f8dc8eb36e97c55350f5 /drivers/rtc/rtc-ds1511.c | |
| parent | f5de24b06aa46427500d0fdbe8616b73a71d8c28 (diff) | |
| parent | 440b004cf953bec2bc8cd91c64ae707fd7e25327 (diff) | |
Merge remote branch 'alsa/fixes' into fix/hda
Diffstat (limited to 'drivers/rtc/rtc-ds1511.c')
| -rw-r--r-- | drivers/rtc/rtc-ds1511.c | 4 |
1 files changed, 2 insertions, 2 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); |