diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /arch/arm/plat-s3c/clock.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'arch/arm/plat-s3c/clock.c')
| -rw-r--r-- | arch/arm/plat-s3c/clock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-s3c/clock.c b/arch/arm/plat-s3c/clock.c index 4d01ef1a25d..619cfa82dca 100644 --- a/arch/arm/plat-s3c/clock.c +++ b/arch/arm/plat-s3c/clock.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* linux/arch/arm/plat-s3c24xx/clock.c | 1 | /* linux/arch/arm/plat-s3c24xx/clock.c |
| 2 | * | 2 | * |
| 3 | * Copyright (c) 2004-2005 Simtec Electronics | 3 | * Copyright 2004-2005 Simtec Electronics |
| 4 | * Ben Dooks <ben@simtec.co.uk> | 4 | * Ben Dooks <ben@simtec.co.uk> |
| 5 | * | 5 | * |
| 6 | * S3C24XX Core clock control support | 6 | * S3C24XX Core clock control support |
| @@ -337,7 +337,7 @@ int s3c24xx_register_clocks(struct clk **clks, int nr_clks) | |||
| 337 | 337 | ||
| 338 | int __init s3c24xx_register_baseclocks(unsigned long xtal) | 338 | int __init s3c24xx_register_baseclocks(unsigned long xtal) |
| 339 | { | 339 | { |
| 340 | printk(KERN_INFO "S3C24XX Clocks, (c) 2004 Simtec Electronics\n"); | 340 | printk(KERN_INFO "S3C24XX Clocks, Copyright 2004 Simtec Electronics\n"); |
| 341 | 341 | ||
| 342 | clk_xtal.rate = xtal; | 342 | clk_xtal.rate = xtal; |
| 343 | 343 | ||