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 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
[pandora-kernel.git]
/
arch
/
arm
/
mach-s3c2412
/
clock.c
diff --git
a/arch/arm/mach-s3c2412/clock.c
b/arch/arm/mach-s3c2412/clock.c
index
96d9eb1
..
a037df5
100644
(file)
--- a/
arch/arm/mach-s3c2412/clock.c
+++ b/
arch/arm/mach-s3c2412/clock.c
@@
-93,12
+93,6
@@
static int s3c2412_upll_enable(struct clk *clk, int enable)
/* clock selections */
-/* CPU EXTCLK input */
-static struct clk clk_ext = {
- .name = "extclk",
- .id = -1,
-};
-
static struct clk clk_erefclk = {
.name = "erefclk",
.id = -1,
@@
-773,5
+767,6
@@
int __init s3c2412_baseclk_add(void)
s3c2412_clkcon_enable(clkp, 0);
}
+ s3c_pwmclk_init();
return 0;
}