diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-04-01 00:22:26 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-04-01 00:22:26 -0400 |
| commit | 399f486286f44d55c4fff0e9cc5d712f2b443489 (patch) | |
| tree | 0c2820b3e04232eaa96f08c1057b87728fb3e7a4 /arch/arm/mach-pnx4008/clock.c | |
| parent | 481419ec9fbdf3f4ec5389c7e91a81b4a7ebee8d (diff) | |
| parent | a9edadbf790d72adf6ebed476cb5caf7743e7e4a (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'arch/arm/mach-pnx4008/clock.c')
| -rw-r--r-- | arch/arm/mach-pnx4008/clock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pnx4008/clock.c b/arch/arm/mach-pnx4008/clock.c index daa8d3d98eff..8e00ed43fb95 100644 --- a/arch/arm/mach-pnx4008/clock.c +++ b/arch/arm/mach-pnx4008/clock.c | |||
| @@ -976,7 +976,7 @@ static int __init clk_init(void) | |||
| 976 | (*clkp)->set_parent((*clkp), (*clkp)->parent); | 976 | (*clkp)->set_parent((*clkp), (*clkp)->parent); |
| 977 | } | 977 | } |
| 978 | pr_debug("%s: clock %s, rate %ld\n", | 978 | pr_debug("%s: clock %s, rate %ld\n", |
| 979 | __FUNCTION__, (*clkp)->name, (*clkp)->rate); | 979 | __func__, (*clkp)->name, (*clkp)->rate); |
| 980 | } | 980 | } |
| 981 | 981 | ||
| 982 | local_clk_use(&ck_pll4); | 982 | local_clk_use(&ck_pll4); |