summaryrefslogtreecommitdiff
path: root/arch/arm/mach-shmobile/clock-r8a7740.c
diff options
context:
space:
mode:
authorMagnus Damm <damm@opensource.se>2012-02-29 16:41:30 +0400
committerRafael J. Wysocki <rjw@sisk.pl>2012-03-13 01:19:43 +0400
commit6b6a4c067cefe04eb0a0e7d1cace16ae727c6295 (patch)
tree73023dbbde650a4640738a5946384fafa070288a /arch/arm/mach-shmobile/clock-r8a7740.c
parent8bac13f591652d0c561f5788eaf0862f788a668f (diff)
downloadlinux-6b6a4c067cefe04eb0a0e7d1cace16ae727c6295.tar.xz
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>
Diffstat (limited to 'arch/arm/mach-shmobile/clock-r8a7740.c')
-rw-r--r--arch/arm/mach-shmobile/clock-r8a7740.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/clock-r8a7740.c b/arch/arm/mach-shmobile/clock-r8a7740.c
index 6a406844c3de..99c4d743a99c 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");
}