From patchwork Tue Jul 7 14:05:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 6733031 X-Patchwork-Delegate: horms@verge.net.au Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 127FCC05AC for ; Tue, 7 Jul 2015 14:07:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2218A206E0 for ; Tue, 7 Jul 2015 14:07:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0232A206DD for ; Tue, 7 Jul 2015 14:07:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757733AbbGGOHB (ORCPT ); Tue, 7 Jul 2015 10:07:01 -0400 Received: from michel.telenet-ops.be ([195.130.137.88]:48877 "EHLO michel.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932172AbbGGOF2 (ORCPT ); Tue, 7 Jul 2015 10:05:28 -0400 Received: from ayla.of.borg ([84.193.93.87]) by michel.telenet-ops.be with bizsmtp id pS5R1q00t1t5w8s06S5RHg; Tue, 07 Jul 2015 16:05:26 +0200 Received: from ramsan.of.borg ([192.168.97.29] helo=ramsan) by ayla.of.borg with esmtp (Exim 4.82) (envelope-from ) id 1ZCTUz-00062r-L4; Tue, 07 Jul 2015 16:05:25 +0200 Received: from geert by ramsan with local (Exim 4.82) (envelope-from ) id 1ZCTV3-0005Fk-Uu; Tue, 07 Jul 2015 16:05:29 +0200 From: Geert Uytterhoeven To: Simon Horman , Magnus Damm Cc: linux-sh@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH] ARM: shmobile: rcar-gen2: CONFIG_ARM_ARCH_TIMER is always set Date: Tue, 7 Jul 2015 16:05:27 +0200 Message-Id: <1436277927-20159-1-git-send-email-geert+renesas@glider.be> X-Mailer: git-send-email 1.9.1 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Since commit 731bde02f622d694 ("ARM: shmobile: Select HAVE_ARM_ARCH_TIMER from Kconfig"), CONFIG_ARM_ARCH_TIMER is always set when building for R-Car Gen2 SoCs, as it is selected by CONFIG_HAVE_ARM_ARCH_TIMER. Remove the obsolete #ifdef testing for it. Signed-off-by: Geert Uytterhoeven --- arch/arm/mach-shmobile/setup-rcar-gen2.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/arm/mach-shmobile/setup-rcar-gen2.c b/arch/arm/mach-shmobile/setup-rcar-gen2.c index aa3339258d9c0232..570d6bd3784f7464 100644 --- a/arch/arm/mach-shmobile/setup-rcar-gen2.c +++ b/arch/arm/mach-shmobile/setup-rcar-gen2.c @@ -52,7 +52,6 @@ u32 rcar_gen2_read_mode_pins(void) void __init rcar_gen2_timer_init(void) { u32 mode = rcar_gen2_read_mode_pins(); -#ifdef CONFIG_ARM_ARCH_TIMER void __iomem *base; int extal_mhz = 0; u32 freq; @@ -125,7 +124,6 @@ void __init rcar_gen2_timer_init(void) } iounmap(base); -#endif /* CONFIG_ARM_ARCH_TIMER */ rcar_gen2_clocks_init(mode); clocksource_of_init();