git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
arm
/
mach-at91
/
clock.c
diff --git
a/arch/arm/mach-at91/clock.c
b/arch/arm/mach-at91/clock.c
index
7f7da43
..
7525cee
100644
(file)
--- a/
arch/arm/mach-at91/clock.c
+++ b/
arch/arm/mach-at91/clock.c
@@
-501,7
+501,8
@@
postcore_initcall(at91_clk_debugfs_init);
int __init clk_register(struct clk *clk)
{
if (clk_is_peripheral(clk)) {
- clk->parent = &mck;
+ if (!clk->parent)
+ clk->parent = &mck;
clk->mode = pmc_periph_mode;
list_add_tail(&clk->node, &clocks);
}