diff options
| author | Geert Uytterhoeven <geert+renesas@glider.be> | 2015-01-26 17:21:14 +0100 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2015-03-12 08:43:34 +0900 |
| commit | 8883e72da3a0859e910f96c0372baf08ab47f7ae (patch) | |
| tree | 25afb98787863a744c5e21bee36ae9e3c92e845a /arch/arm/mach-shmobile/setup-rcar-gen2.c | |
| parent | e2fd51b7e1742b82529a39107ed59ac0da69321d (diff) | |
| download | linux-8883e72da3a0859e910f96c0372baf08ab47f7ae.tar.gz linux-8883e72da3a0859e910f96c0372baf08ab47f7ae.tar.bz2 linux-8883e72da3a0859e910f96c0372baf08ab47f7ae.zip | |
ARM: shmobile: R-Car Gen2: CONFIG_COMMON_CLK is always set
Since commit e042681894b62d60 ("ARM: shmobile: r8a7790: Remove legacy
code"), all R-Car Gen2 SoCs are supported by multiplatform kernels only.
As CONFIG_COMMON_CLK is always set for multiplatform kernels, we can
remove related #ifdefs in code specific to R-Car Gen2 SoCs.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/mach-shmobile/setup-rcar-gen2.c')
| -rw-r--r-- | arch/arm/mach-shmobile/setup-rcar-gen2.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-shmobile/setup-rcar-gen2.c b/arch/arm/mach-shmobile/setup-rcar-gen2.c index d1fa625e61f5..51464cc6d65b 100644 --- a/arch/arm/mach-shmobile/setup-rcar-gen2.c +++ b/arch/arm/mach-shmobile/setup-rcar-gen2.c @@ -50,9 +50,7 @@ u32 rcar_gen2_read_mode_pins(void) void __init rcar_gen2_timer_init(void) { -#if defined(CONFIG_ARM_ARCH_TIMER) || defined(CONFIG_COMMON_CLK) u32 mode = rcar_gen2_read_mode_pins(); -#endif #ifdef CONFIG_ARM_ARCH_TIMER void __iomem *base; int extal_mhz = 0; @@ -128,9 +126,7 @@ void __init rcar_gen2_timer_init(void) iounmap(base); #endif /* CONFIG_ARM_ARCH_TIMER */ -#ifdef CONFIG_COMMON_CLK rcar_gen2_clocks_init(mode); -#endif #ifdef CONFIG_ARCH_SHMOBILE_MULTI clocksource_of_init(); #endif |