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 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
arm
/
mach-mmp
/
pxa910.c
diff --git
a/arch/arm/mach-mmp/pxa910.c
b/arch/arm/mach-mmp/pxa910.c
index
d404950
..
46f2d69
100644
(file)
--- a/
arch/arm/mach-mmp/pxa910.c
+++ b/
arch/arm/mach-mmp/pxa910.c
@@
-131,7
+131,7
@@
static int __init pxa910_init(void)
mfp_init_base(MFPR_VIRT_BASE);
mfp_init_addr(pxa910_mfp_addr_map);
pxa_init_dma(IRQ_PXA910_DMA_INT0, 32);
- clk
s_register
(ARRAY_AND_SIZE(pxa910_clkregs));
+ clk
dev_add_table
(ARRAY_AND_SIZE(pxa910_clkregs));
}
return 0;