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-pxa
/
pxa25x.c
diff --git
a/arch/arm/mach-pxa/pxa25x.c
b/arch/arm/mach-pxa/pxa25x.c
index
2c1b0b7
..
0b9ad30
100644
(file)
--- a/
arch/arm/mach-pxa/pxa25x.c
+++ b/
arch/arm/mach-pxa/pxa25x.c
@@
-349,7
+349,7
@@
static int __init pxa25x_init(void)
reset_status = RCSR;
reset_status = RCSR;
- clk
s_register
(pxa25x_clkregs, ARRAY_SIZE(pxa25x_clkregs));
+ clk
dev_add_table
(pxa25x_clkregs, ARRAY_SIZE(pxa25x_clkregs));
if ((ret = pxa_init_dma(IRQ_DMA, 16)))
return ret;
if ((ret = pxa_init_dma(IRQ_DMA, 16)))
return ret;
@@
-370,7
+370,7
@@
static int __init pxa25x_init(void)
/* Only add HWUART for PXA255/26x; PXA210/250 do not have it. */
if (cpu_is_pxa255())
/* Only add HWUART for PXA255/26x; PXA210/250 do not have it. */
if (cpu_is_pxa255())
- clk
s_register(&pxa25x_hwuart_clkreg, 1
);
+ clk
dev_add(&pxa25x_hwuart_clkreg
);
return ret;
}
return ret;
}