diff options
| author | Magnus Damm | 2012-02-29 13:41:30 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki | 2012-03-12 22:19:43 +0100 |
| commit | 6b6a4c067cefe04eb0a0e7d1cace16ae727c6295 (patch) | |
| tree | 73023dbbde650a4640738a5946384fafa070288a /arch/arm/mach-shmobile/include/mach/common.h | |
| parent | ARM: mach-shmobile: r8a7779 L2 cache support (diff) | |
| download | kernel-qcow2-linux-6b6a4c067cefe04eb0a0e7d1cace16ae727c6295.tar.gz kernel-qcow2-linux-6b6a4c067cefe04eb0a0e7d1cace16ae727c6295.tar.xz kernel-qcow2-linux-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/include/mach/common.h')
| -rw-r--r-- | arch/arm/mach-shmobile/include/mach/common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/include/mach/common.h b/arch/arm/mach-shmobile/include/mach/common.h index c1b77d588bb3..f005ac0e4621 100644 --- a/arch/arm/mach-shmobile/include/mach/common.h +++ b/arch/arm/mach-shmobile/include/mach/common.h @@ -6,7 +6,7 @@ extern void shmobile_setup_console(void); extern void shmobile_secondary_vector(void); extern int shmobile_platform_cpu_kill(unsigned int cpu); struct clk; -extern int clk_init(void); +extern int shmobile_clk_init(void); extern void shmobile_handle_irq_intc(struct pt_regs *); extern struct platform_suspend_ops shmobile_suspend_ops; struct cpuidle_driver; |