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 commit 'kumar/next' into merge
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
pxa3xx.c
diff --git
a/arch/arm/mach-pxa/pxa3xx.c
b/arch/arm/mach-pxa/pxa3xx.c
index
fcb0721
..
4d7c03e
100644
(file)
--- a/
arch/arm/mach-pxa/pxa3xx.c
+++ b/
arch/arm/mach-pxa/pxa3xx.c
@@
-634,7
+634,7
@@
static int __init pxa3xx_init(void)
*/
ASCR &= ~(ASCR_RDH | ASCR_D1S | ASCR_D2S | ASCR_D3S);
- clk
s_register
(pxa3xx_clkregs, ARRAY_SIZE(pxa3xx_clkregs));
+ clk
dev_add_table
(pxa3xx_clkregs, ARRAY_SIZE(pxa3xx_clkregs));
if ((ret = pxa_init_dma(IRQ_DMA, 32)))
return ret;