From patchwork Sat May 27 09:58:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 9751759 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 00C7E602F0 for ; Sat, 27 May 2017 10:00:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 01E6C27B81 for ; Sat, 27 May 2017 10:00:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EAC342845C; Sat, 27 May 2017 10:00:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7EC6127B81 for ; Sat, 27 May 2017 10:00:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=Pt5f1EJfxn/DJKkwopSmP6KrJsNshjw/FPQZIBGp8MM=; b=dPPkVjDZiQiw/zlxeMiZllTRVk S8BRctWLI4kGwEz8uTIXEmb1tMb6xI2XIeBrmO2VxBGnjYZ1cHgdGo1XJyrcv9wzOXAnqL+N6c3Hr pOJEOr5QBIyQlX3zSm2f/9x7E3Ue8I2L3yArcPHtWpyrbQ6srpd9qgJXMAexEE1rSahXNp52SM2bw KffXAdShU/hF4+YFqwfHCDbJq2d1++u3LmTgo3cIaq+8xHaWc+yynhjDTiK5r0pgzdKx6PKBLapR0 jmsiwU821MbKV3bDnTkVebHmeNLTVbXX6cjV0lLmPdeEM+GJam4kSN10jajYQAGrVfLVVBNCEVfBx O/xEFJ1w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dEYWb-0003pq-QS; Sat, 27 May 2017 10:00:45 +0000 Received: from merlin.infradead.org ([2001:4978:20e::2]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dEYW3-0002qO-OQ for linux-arm-kernel@bombadil.infradead.org; Sat, 27 May 2017 10:00:11 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=z48lyiHJBNAWHI2g61iarRKUHT8Zu2GC9lED1BWSSSo=; b=17l1wpd2BfhIVva3lAFo04EsN 0YoasNPCNXDQePAwdbdNts+J7pc/fFLpx6/M6dt5TLqHPNYh6PSYmp6i4MkDTKx8pvZkdpRMtouBO 3c5YEKof1XEVjJg/1vYThRyRjl8OPp9NJBCj5EkERRw7quki4uhC97VxqtDHlnpZvYjtoxrB+2b+x lSRibCK7BAK06XkfBxGLiRcAiXEqfoG+Fxn8avHs+WOuozCJSMUU0b/PO9fxLOKf/KYMzh5QJDJ7q TzSRLZhf7AyOrJAX5AioMjTzwVjjzfLDUg5Tvq/rANaotYhwJlcz7TXSxOEmNdpAwN34+wUL6M3bC p5Xwmkl5A==; Received: from mail-wr0-x22d.google.com ([2a00:1450:400c:c0c::22d]) by merlin.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dEYW1-00066k-Qx for linux-arm-kernel@lists.infradead.org; Sat, 27 May 2017 10:00:10 +0000 Received: by mail-wr0-x22d.google.com with SMTP id z52so12830399wrc.2 for ; Sat, 27 May 2017 02:59:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=z48lyiHJBNAWHI2g61iarRKUHT8Zu2GC9lED1BWSSSo=; b=ML+FBgDnf+B4D/cz99ST8Sh5aNf33nWJQSn2OdFKisrS8HStq2tMMXYjmfd6lIAOe8 i6uI3mxqiM0hW877cI59g4OB2PVYssRcfeOokeYqsTJGFwI2wxuDgRFCaFyCu9MUziId pljaq1I1sojQwfY08wq1vTs1B03mLEX0Uhuu8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=z48lyiHJBNAWHI2g61iarRKUHT8Zu2GC9lED1BWSSSo=; b=lMOLDRjt3oWqZ78Li8/295djUosJFpc7cROmIwl9w9lzN9GfccupadpGGTjUDKqKD9 1u5S+RWochdf5QtEWUCjV+NvD8nnGOtGbNtLW3Jd/aKli6PNsExIR/nOxfQW6OkqEZcl V03u8WMwqiZnAcqOU7ytRKCemqiGyrKG63+eSPyvJONXPgydGdLXKgCtdQI6pL7uYoiz tQYc/bbZKWU0tEKt8vFv1kUzz8qfRoDJqt7ci/YqlsFpe02Tv2vbN5ZhhsPHYPejKkkj eAK91tR4Vk480e3RuaNS8cO6EFFVBgzNxKuZCshOScW7E8FD6Ql7b89NKLpb+HDzdA2Z NF3A== X-Gm-Message-State: AODbwcDJrzkCwXu4FyIAUd5YLbUtSEcen/zetUvn2NQfn1pKOHyQpHgu nHtxbv5WPnRkj97T X-Received: by 10.223.135.50 with SMTP id a47mr4424649wra.138.1495879187587; Sat, 27 May 2017 02:59:47 -0700 (PDT) Received: from localhost.localdomain (sju31-1-78-210-255-2.fbx.proxad.net. [78.210.255.2]) by smtp.gmail.com with ESMTPSA id t85sm5132306wmt.23.2017.05.27.02.59.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 27 May 2017 02:59:47 -0700 (PDT) From: Daniel Lezcano To: tglx@linutronix.de, daniel.lezcano@linaro.org Subject: [PATCH 7/7] clocksource: Rename CLKSRC_ACPI Date: Sat, 27 May 2017 11:58:48 +0200 Message-Id: <1495879129-28109-7-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1495879129-28109-1-git-send-email-daniel.lezcano@linaro.org> References: <1495879129-28109-1-git-send-email-daniel.lezcano@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170527_060010_018931_81DB70A8 X-CRM114-Status: GOOD ( 12.16 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The config option name is now renamed to 'CLKSRC_ACPI' for consistency with the CLOCKSOURCE_OF_DECLARE => TIMER_OF_DECLARE change. Signed-off-by: Daniel Lezcano Reviewed-by: Linus Walleij --- drivers/clocksource/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index 90f062e..4ba230d 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -5,7 +5,7 @@ config TIMER_OF bool select TIMER_PROBE -config CLKSRC_ACPI +config TIMER_ACPI bool select TIMER_PROBE @@ -310,7 +310,7 @@ config ARC_TIMERS_64BIT config ARM_ARCH_TIMER bool select TIMER_OF if OF - select CLKSRC_ACPI if ACPI + select TIMER_ACPI if ACPI config ARM_ARCH_TIMER_EVTSTREAM bool "Enable ARM architected timer event stream generation by default"