diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-12-18 14:52:04 +0000 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-12-18 14:52:04 +0000 |
| commit | 7f2754378f3522a42daafdbb9d2385f341008454 (patch) | |
| tree | 7a6223f270cdf53067a70c2e86b2190d3577c23d /arch/arm/mach-s3c2412 | |
| parent | c6ad115876763e4f15055982ecb9579cb7abab5f (diff) | |
| parent | a9c5d23ac724a3b908833cafbbbd49abe4741b86 (diff) | |
| download | linux-7f2754378f3522a42daafdbb9d2385f341008454.tar.gz linux-7f2754378f3522a42daafdbb9d2385f341008454.tar.bz2 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.c | 7 |
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; } |