Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (42 commits) tree-wide: fix misspelling of "definition" in comments reiserfs: fix misspelling of "journaled" doc: Fix a typo in slub.txt. inotify: remove superfluous return code check hdlc: spelling fix in find_pvc() comment doc: fix regulator docs cut-and-pasteism mtd: Fix comment in Kconfig doc: Fix IRQ chip docs tree-wide: fix assorted typos all over the place drivers/ata/libata-sff.c: comment spelling fixes fix typos/grammos in Documentation/edac.txt sysctl: add missing comments fs/debugfs/inode.c: fix comment typos sgivwfb: Make use of ARRAY_SIZE. sky2: fix sky2_link_down copy/paste comment error tree-wide: fix typos "couter" -> "counter" tree-wide: fix typos "offest" -> "offset" fix kerneldoc for set_irq_msi() spidev: fix double "of of" in comment comment typo fix: sybsystem -> subsystem ...
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
* An rtc driver for the Dallas DS1511
|
||||
*
|
||||
* Copyright (C) 2006 Atsushi Nemoto <anemo@mba.ocn.ne.jp>
|
||||
* Copyright (C) 2007 Andrew Sharp <andy.sharp@onstor.com>
|
||||
* Copyright (C) 2007 Andrew Sharp <andy.sharp@lsi.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License version 2 as
|
||||
@@ -636,7 +636,7 @@ ds1511_rtc_exit(void)
|
||||
module_init(ds1511_rtc_init);
|
||||
module_exit(ds1511_rtc_exit);
|
||||
|
||||
MODULE_AUTHOR("Andrew Sharp <andy.sharp@onstor.com>");
|
||||
MODULE_AUTHOR("Andrew Sharp <andy.sharp@lsi.com>");
|
||||
MODULE_DESCRIPTION("Dallas DS1511 RTC driver");
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_VERSION(DRV_VERSION);
|
||||
|
@@ -286,7 +286,7 @@ static struct bin_attribute stk17ta8_nvram_attr = {
|
||||
.write = stk17ta8_nvram_write,
|
||||
};
|
||||
|
||||
static int __init stk17ta8_rtc_probe(struct platform_device *pdev)
|
||||
static int __devinit stk17ta8_rtc_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct rtc_device *rtc;
|
||||
struct resource *res;
|
||||
|
@@ -335,7 +335,7 @@ static int rtc_probe(struct platform_device *pdev)
|
||||
goto err_io;
|
||||
}
|
||||
|
||||
/* Make sure frequency measurment mode, test modes, and lock
|
||||
/* Make sure frequency measurement mode, test modes, and lock
|
||||
* are all disabled */
|
||||
v3020_set_reg(chip, V3020_STATUS_0, 0x0);
|
||||
|
||||
|
Reference in New Issue
Block a user