projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
[linux-2.6-block.git]
/
drivers
/
clk
/
pxa
/
clk-pxa.h
diff --git
a/drivers/clk/pxa/clk-pxa.h
b/drivers/clk/pxa/clk-pxa.h
index 7bf532dca7090a4f5e599d070bfaf86e22c99ba1..d1de805df86733bb2a4b69505f070bae72f23f3f 100644
(file)
--- a/
drivers/clk/pxa/clk-pxa.h
+++ b/
drivers/clk/pxa/clk-pxa.h
@@
-72,7
+72,7
@@
struct desc_clk_cken {
const char *name;
const char *dev_id;
const char *con_id;
- const char **parent_names;
+ const char *
const
*parent_names;
struct clk_fixed_factor lp;
struct clk_fixed_factor hp;
struct clk_gate gate;