Merge tag 'renesas-soc4-for-v3.18' of git://git.kernel.org/pub/scm/li…

…nux/kernel/git/horms/renesas into next/soc

Merge "Fourth Round of Renesas ARM Based SoC Soc Updates for v3.18" from Simon Horman:

Fourth Round of Renesas ARM Based SoC Soc Updates for v3.18

* r8a7794: Remove unnecessary #ifdef CONFIG_USE_OF

* tag 'renesas-soc4-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: r8a7794: Remove unnecessary #ifdef CONFIG_USE_OF

Signed-off-by: Olof Johansson <olof@lixom.net>

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 */