| From c5cbdbce8978b5b8baf3cd96a10ea6ce76e2decd Mon Sep 17 00:00:00 2001 |
| From: Magnus Damm <damm@opensource.se> |
| Date: Wed, 29 Feb 2012 21:41:30 +0900 |
| Subject: ARM: mach-shmobile: rename clk_init() to shmobile_clk_init() |
| |
| Rename clk_init() to shmobile_clk_init() to avoid a potential |
| future name space collision with the common clock framework. |
| |
| Signed-off-by: Magnus Damm <damm@opensource.se> |
| Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> |
| (cherry picked from commit 6b6a4c067cefe04eb0a0e7d1cace16ae727c6295) |
| |
| Conflicts: |
| |
| arch/arm/mach-shmobile/clock-r8a7779.c |
| |
| Signed-off-by: Simon Horman <horms@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/clock-r8a7740.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/arch/arm/mach-shmobile/clock-r8a7740.c b/arch/arm/mach-shmobile/clock-r8a7740.c |
| index 6a40684..99c4d74 100644 |
| --- a/arch/arm/mach-shmobile/clock-r8a7740.c |
| +++ b/arch/arm/mach-shmobile/clock-r8a7740.c |
| @@ -376,7 +376,7 @@ void __init r8a7740_clock_init(u8 md_ck) |
| clkdev_add_table(lookups, ARRAY_SIZE(lookups)); |
| |
| if (!ret) |
| - clk_init(); |
| + shmobile_clk_init(); |
| else |
| panic("failed to setup r8a7740 clocks\n"); |
| } |
| -- |
| 1.7.10 |
| |
