projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'nfsd-next' of git://linux-nfs.org/~bfields/linux
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
drivers
/
power
/
pm2301_charger.c
diff --git
a/drivers/power/pm2301_charger.c
b/drivers/power/pm2301_charger.c
index
1c0bfcb
..
ffa10ed
100644
(file)
--- a/
drivers/power/pm2301_charger.c
+++ b/
drivers/power/pm2301_charger.c
@@
-386,7
+386,7
@@
static int pm2_int_reg2(void *pm2_data, int val)
if (val & (PM2XXX_INT3_ITCHPRECHARGEWD |
PM2XXX_INT3_ITCHCCWD | PM2XXX_INT3_ITCHCVWD)) {
dev_dbg(pm2->dev,
- "Watchdog occured for precharge, CC and CV charge\n");
+ "Watchdog occur
r
ed for precharge, CC and CV charge\n");
}
return ret;