git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
[sfrench/cifs-2.6.git]
/
drivers
/
clk
/
clk-npcm7xx.c
diff --git
a/drivers/clk/clk-npcm7xx.c
b/drivers/clk/clk-npcm7xx.c
index c5edf8f2fd1969337b7803ef96884ee9164495fb..27a86b7a34dbf64df553ac8283904310cc2da24c 100644
(file)
--- a/
drivers/clk/clk-npcm7xx.c
+++ b/
drivers/clk/clk-npcm7xx.c
@@
-549,7
+549,7
@@
static void __init npcm7xx_clk_init(struct device_node *clk_np)
ret = of_address_to_resource(clk_np, 0, &res);
if (ret) {
- pr_err("%
s: failed to get resource, ret %d\n", clk_np->name
,
+ pr_err("%
pOFn: failed to get resource, ret %d\n", clk_np
,
ret);
return;
}