From: horms@verge.net.au (Simon Horman) Date: Thu, 11 Sep 2014 09:51:13 +0900 Subject: [PATCH] ARM: shmobile: r8a7794: Remove unnecessary #ifdef CONFIG_USE_OF In-Reply-To: <1410309811-14918-1-git-send-email-horms+renesas@verge.net.au> References: <1410309811-14918-1-git-send-email-horms+renesas@verge.net.au> Message-ID: <20140911005113.GB23371@verge.net.au> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Wed, Sep 10, 2014 at 09:43:31AM +0900, Simon Horman wrote: > The r8a7794 support is always compiled using ARCH_MULTIPLATFORM which > selects USE_OF. So #ifdef CONFIG_USE_OF is unnecessary. > > Cc: Ulrich Hecht > Reported-by: Arnd Bergmann > Signed-off-by: Simon Horman I have queued this up. > --- > > This patch is based on renesas-devel-20140910v2-v3.17-rc4 > > arch/arm/mach-shmobile/setup-r8a7794.c | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/arch/arm/mach-shmobile/setup-r8a7794.c b/arch/arm/mach-shmobile/setup-r8a7794.c > index 05e970c..c10acd1 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 > > -#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 */ > -- > 2.0.1 >