| Message ID | 1434533661-22730-1-git-send-email-geert+renesas@glider.be (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | d62ba10c31ac16aaa16f5b49308658ea2f1e71a9 |
| Delegated to: | Simon Horman |
| Headers | show |
On Wed, Jun 17, 2015 at 11:34:20AM +0200, Geert Uytterhoeven wrote: > Since commit e042681894b62d60 ("ARM: shmobile: r8a7790: Remove legacy > code"), all R-Car Gen2 SoCs are supported by multiplatform kernels only. > As CONFIG_ARCH_SHMOBILE_MULTI is always set for shmobile multiplatform > kernels, we can remove related #ifdefs in code specific to R-Car Gen2 > SoCs. > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Thanks, I have queued this up. -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/mach-shmobile/setup-rcar-gen2.c b/arch/arm/mach-shmobile/setup-rcar-gen2.c index 5d13595aa027447d..aa3339258d9c0232 100644 --- a/arch/arm/mach-shmobile/setup-rcar-gen2.c +++ b/arch/arm/mach-shmobile/setup-rcar-gen2.c @@ -128,9 +128,7 @@ void __init rcar_gen2_timer_init(void) #endif /* CONFIG_ARM_ARCH_TIMER */ rcar_gen2_clocks_init(mode); -#ifdef CONFIG_ARCH_SHMOBILE_MULTI clocksource_of_init(); -#endif } struct memory_reserve_config {
Since commit e042681894b62d60 ("ARM: shmobile: r8a7790: Remove legacy code"), all R-Car Gen2 SoCs are supported by multiplatform kernels only. As CONFIG_ARCH_SHMOBILE_MULTI is always set for shmobile multiplatform kernels, we can remove related #ifdefs in code specific to R-Car Gen2 SoCs. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- arch/arm/mach-shmobile/setup-rcar-gen2.c | 2 -- 1 file changed, 2 deletions(-)