linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Daniel Lezcano <daniel.lezcano@linaro.org>
To: tglx@linutronix.de, daniel.lezcano@linaro.org
Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: [PATCH 7/7] clocksource: Rename CLKSRC_ACPI
Date: Sat, 27 May 2017 11:58:48 +0200	[thread overview]
Message-ID: <1495879129-28109-7-git-send-email-daniel.lezcano@linaro.org> (raw)
In-Reply-To: <1495879129-28109-1-git-send-email-daniel.lezcano@linaro.org>

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 <daniel.lezcano@linaro.org>
---
 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"
-- 
2.7.4

  parent reply	other threads:[~2017-05-27  9:59 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-27  9:58 [PATCH 1/7] Revert "clockevents: Add a clkevt-of mechanism like clksrc-of" Daniel Lezcano
2017-05-27  9:58 ` [PATCH 4/7] clocksource: Rename CLOCKSOURCE_ACPI_DECLARE Daniel Lezcano
2017-05-28 13:50   ` Linus Walleij
2017-05-27  9:58 ` [PATCH 5/7] clocksource: Rename clksrc Daniel Lezcano
2017-05-28 13:51   ` Linus Walleij
2017-05-27  9:58 ` [PATCH 6/7] clocksource: Rename CLKSRC_OF to TIMER_OF Daniel Lezcano
2017-05-28  3:00   ` Shawn Guo
2017-05-28  9:18     ` Daniel Lezcano
2017-05-28 13:52   ` Linus Walleij
2017-05-31  8:24   ` Krzysztof Kozlowski
2017-05-27  9:58 ` Daniel Lezcano [this message]
2017-05-28 13:52   ` [PATCH 7/7] clocksource: Rename CLKSRC_ACPI Linus Walleij
     [not found] ` <1495879129-28109-2-git-send-email-daniel.lezcano@linaro.org>
2017-05-29  8:02   ` [PATCH 2/7] clocksource: Rename CLOCKSOURCE_OF_DECLARE Mason

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1495879129-28109-7-git-send-email-daniel.lezcano@linaro.org \
    --to=daniel.lezcano@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).