From: Simon Horman <horms+renesas@verge.net.au>
Date: Wed, 10 Sep 2014 00:43:31 +0000 (+0900)
Subject: ARM: shmobile: r8a7794: Remove unnecessary #ifdef CONFIG_USE_OF
X-Git-Tag: firefly_0821_release~176^2~3111^2~7^2~2
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=1370078db37de2aa5e906ae2b5dbbb6ba289adb4;p=firefly-linux-kernel-4.4.55.git

ARM: shmobile: r8a7794: Remove unnecessary #ifdef CONFIG_USE_OF

The r8a7794 support is always compiled using ARCH_MULTIPLATFORM which
selects USE_OF. So #ifdef CONFIG_USE_OF is unnecessary.

Reported-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---

diff --git a/arch/arm/mach-shmobile/setup-r8a7794.c b/arch/arm/mach-shmobile/setup-r8a7794.c
index 05e970c96efe..c10acd125aec 100644
--- a/arch/arm/mach-shmobile/setup-r8a7794.c
+++ b/arch/arm/mach-shmobile/setup-r8a7794.c
@@ -19,8 +19,6 @@
 #include "rcar-gen2.h"
 #include <asm/mach/arch.h>
 
-#ifdef CONFIG_USE_OF
-
 static const char * const r8a7794_boards_compat_dt[] __initconst = {
 	"renesas,r8a7794",
 	NULL,
@@ -32,4 +30,3 @@ DT_MACHINE_START(R8A7794_DT, "Generic R8A7794 (Flattened Device Tree)")
 	.init_time	= rcar_gen2_timer_init,
 	.dt_compat	= r8a7794_boards_compat_dt,
 MACHINE_END
-#endif /* CONFIG_USE_OF */