diff options
| author | Olof Johansson <olof@lixom.net> | 2014-09-24 11:17:26 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-09-24 11:17:43 -0700 |
| commit | 739d8d8bc33488ef11b34875e84860db7e09c8b4 (patch) | |
| tree | c12e2bed952387bc8e5408c260477b07d213dc13 /arch/arm/mach-shmobile | |
| parent | d66820853251e8a9b53125a95a773e482cd79136 (diff) | |
| parent | 1370078db37de2aa5e906ae2b5dbbb6ba289adb4 (diff) | |
| download | linux-739d8d8bc33488ef11b34875e84860db7e09c8b4.tar.bz2 | |
Merge tag 'renesas-soc4-for-v3.18' of git://git.kernel.org/pub/scm/linux/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>
Diffstat (limited to 'arch/arm/mach-shmobile')
| -rw-r--r-- | arch/arm/mach-shmobile/setup-r8a7794.c | 3 |
1 files changed, 0 insertions, 3 deletions
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 */ |