diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-30 09:36:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-30 09:36:50 -0700 |
| commit | 5d434fcb255dec99189f1c58a06e4f56e12bf77d (patch) | |
| tree | 734289dc85074903d9e636a935d43414746e222c /drivers/rtc | |
| parent | 5a5a1bf099d6942399ea0b34a62e5f0bc4c5c36e (diff) | |
| parent | 071361d3473ebb8142907470ff12d59c59f6be72 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina:
"Usual stuff, mostly comment fixes, typo fixes, printk fixes and small
code cleanups"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (45 commits)
mm: Convert print_symbol to %pSR
gfs2: Convert print_symbol to %pSR
m32r: Convert print_symbol to %pSR
iostats.txt: add easy-to-find description for field 6
x86 cmpxchg.h: fix wrong comment
treewide: Fix typo in printk and comments
doc: devicetree: Fix various typos
docbook: fix 8250 naming in device-drivers
pata_pdc2027x: Fix compiler warning
treewide: Fix typo in printks
mei: Fix comments in drivers/misc/mei
treewide: Fix typos in kernel messages
pm44xx: Fix comment for "CONFIG_CPU_IDLE"
doc: Fix typo "CONFIG_CGROUP_CGROUP_MEMCG_SWAP"
mmzone: correct "pags" to "pages" in comment.
kernel-parameters: remove outdated 'noresidual' parameter
Remove spurious _H suffixes from ifdef comments
sound: Remove stray pluses from Kconfig file
radio-shark: Fix printk "CONFIG_LED_CLASS"
doc: put proper reference to CONFIG_MODULE_SIG_ENFORCE
...
Diffstat (limited to 'drivers/rtc')
| -rw-r--r-- | drivers/rtc/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/rtc/rtc-max8997.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig index 79fbe3832df..0c81915b199 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig @@ -402,7 +402,7 @@ config RTC_DRV_TPS6586X tristate "TI TPS6586X RTC driver" depends on MFD_TPS6586X help - TI Power Managment IC TPS6586X supports RTC functionality + TI Power Management IC TPS6586X supports RTC functionality along with alarm. This driver supports the RTC driver for the TPS6586X RTC module. @@ -420,7 +420,7 @@ config RTC_DRV_TPS80031 tristate "TI TPS80031/TPS80032 RTC driver" depends on MFD_TPS80031 help - TI Power Managment IC TPS80031 supports RTC functionality + TI Power Management IC TPS80031 supports RTC functionality along with alarm. This driver supports the RTC driver for the TPS80031 RTC module. diff --git a/drivers/rtc/rtc-max8997.c b/drivers/rtc/rtc-max8997.c index 5693619614f..dacf48db792 100644 --- a/drivers/rtc/rtc-max8997.c +++ b/drivers/rtc/rtc-max8997.c @@ -24,7 +24,7 @@ /* Module parameter for WTSR function control */ static int wtsr_en = 1; module_param(wtsr_en, int, 0444); -MODULE_PARM_DESC(wtsr_en, "Wachdog Timeout & Sofware Reset (default=on)"); +MODULE_PARM_DESC(wtsr_en, "Watchdog Timeout & Software Reset (default=on)"); /* Module parameter for SMPL function control */ static int smpl_en = 1; module_param(smpl_en, int, 0444); |