diff options
| author |   Magnus Damm <damm@opensource.se> | 2012-02-29 21:41:30 +0900 |
|---|---|---|
| committer |   Rafael J. Wysocki <rjw@sisk.pl> | 2012-03-12 22:19:43 +0100 |
| commit | 6b6a4c067cefe04eb0a0e7d1cace16ae727c6295 (patch) | |
| tree | 73023dbbde650a4640738a5946384fafa070288a /arch/arm/mach-shmobile/clock-r8a7779.c | |
| parent | ARM: mach-shmobile: r8a7779 L2 cache support (diff) | |
| download | linux-dev-6b6a4c067cefe04eb0a0e7d1cace16ae727c6295.tar.xz linux-dev-6b6a4c067cefe04eb0a0e7d1cace16ae727c6295.zip | |
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-r8a7779.c')
| -rw-r--r-- | arch/arm/mach-shmobile/clock-r8a7779.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/clock-r8a7779.c b/arch/arm/mach-shmobile/clock-r8a7779.c index 317ab525ce20..7d6e9fe47b56 100644 --- a/arch/arm/mach-shmobile/clock-r8a7779.c +++ b/arch/arm/mach-shmobile/clock-r8a7779.c @@ -170,7 +170,7 @@ void __init r8a7779_clock_init(void) clkdev_add_table(lookups, ARRAY_SIZE(lookups)); if (!ret) - clk_init(); + shmobile_clk_init(); else panic("failed to setup r8a7779 clocks\n"); } |