summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c2412
diff options
context:
space:
mode:
authorBen Dooks2008-12-18 15:52:04 +0100
committerBen Dooks2008-12-18 15:52:04 +0100
commit7f2754378f3522a42daafdbb9d2385f341008454 (patch)
tree7a6223f270cdf53067a70c2e86b2190d3577c23d /arch/arm/mach-s3c2412
parentMerge branch 'next-s3c24xx' into next-merged (diff)
parent[ARM] S3C64XX: Correct the EINT IRQ type configuration (diff)
downloadkernel-qcow2-linux-7f2754378f3522a42daafdbb9d2385f341008454.tar.gz
kernel-qcow2-linux-7f2754378f3522a42daafdbb9d2385f341008454.tar.xz
kernel-qcow2-linux-7f2754378f3522a42daafdbb9d2385f341008454.zip
Merge branch 'next-s3c64xx' into next-merged
Diffstat (limited to 'arch/arm/mach-s3c2412')
-rw-r--r--arch/arm/mach-s3c2412/clock.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/arm/mach-s3c2412/clock.c b/arch/arm/mach-s3c2412/clock.c
index 96d9eb15424f..a037df5e1c2d 100644
--- 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;
}