diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-17 07:04:46 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-17 07:04:46 -0400 |
| commit | 69887ac1dcb79dfc773dabac2dd081fa6d6e2573 (patch) | |
| tree | 23a4f685c71ff8666548b0a01b221928e46a9287 /arch/arm/mach-s3c2410/clock.c | |
| parent | 5e014b10ef8477c32a939a48fa02aedcad35a226 (diff) | |
| parent | 118326e940bdecef6c459d42ccf05256ba86daa7 (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/arm/mach-s3c2410/clock.c')
| -rw-r--r-- | arch/arm/mach-s3c2410/clock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2410/clock.c b/arch/arm/mach-s3c2410/clock.c index e23f534d4e1d..8d986b8401c2 100644 --- a/arch/arm/mach-s3c2410/clock.c +++ b/arch/arm/mach-s3c2410/clock.c | |||
| @@ -478,7 +478,7 @@ static int s3c2440_clk_add(struct sys_device *sysdev) | |||
| 478 | { | 478 | { |
| 479 | unsigned long upllcon = __raw_readl(S3C2410_UPLLCON); | 479 | unsigned long upllcon = __raw_readl(S3C2410_UPLLCON); |
| 480 | 480 | ||
| 481 | s3c2440_clk_upll.rate = s3c2410_get_pll(upllcon, clk_xtal.rate) * 2; | 481 | s3c2440_clk_upll.rate = s3c2410_get_pll(upllcon, clk_xtal.rate); |
| 482 | 482 | ||
| 483 | printk("S3C2440: Clock Support, UPLL %ld.%03ld MHz\n", | 483 | printk("S3C2440: Clock Support, UPLL %ld.%03ld MHz\n", |
| 484 | print_mhz(s3c2440_clk_upll.rate)); | 484 | print_mhz(s3c2440_clk_upll.rate)); |