Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp2188402pxb; Fri, 5 Feb 2021 11:03:05 -0800 (PST) X-Google-Smtp-Source: ABdhPJxm27wCUidhG57d6FA14hBpYZ1BnTuMWJQ+zK6Nnzt8UyJFYBuDxVDPn74CFkjy+Q/xiCCM X-Received: by 2002:aa7:c884:: with SMTP id p4mr5056936eds.212.1612551785361; Fri, 05 Feb 2021 11:03:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612551785; cv=none; d=google.com; s=arc-20160816; b=nyIMpPi0wimom4aUeWms7NeQhKq8oTWIEEXFPlcz5CHZucxq8DrXVI0WT+tptQSByW u2cyfH3bXXuZi3a83rg8oDWMBa2RLCavuRqRgBXClfqjHb5sSsub/7WlB4YFv1TP5uid X42bndwDW4CE5YDieCM9O7IRoihhYcdxBBjrm2qLleJUAerE+fwC1XzP2IueO112H24p y2u36gVWWtP8IzIg5QEFRRRwIOqI/i7/kuQdhECsE5C01xjDRKliO3H9vdMFC5rscPOc Tx8ypYQmyw/ub/7pdlpUPMyWtfMu0dkkrB50RXUTJHl30xvYvuCw2Ttw+OWmVdgJy5Jm bPoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=ThxGWeqsK4d0OgDaQKX6wTkCCqd4OEQOPXa8W7M8KMI=; b=m5xcJCI1QVvqzwM6/AI0laSSQvi9y92otXOlTGKPM5F8dHsWwCbNm2bkOdIhfLqfw/ jzrGQ8YaSTSqNvfW1LZvkFxKQHWDrn57cK4vYlKJxwFB9VLlhClSPLXMvjHcEnWgQ005 NQHnf88o9dxO7fJNnf64H7zAe0axJKkXVqSD1FZ4Mb8WL0io3ha7q8DcgNCCNo1C3Mp7 8ilwuIR0kpz+UjXH+7dRfepLuIAjVU6VKQlHO7XvXsNthOxvg9WDNao94JZfwRpO93Km 3et31/cji76mqaqVs5VanW3R+4Fy0V0T0fzrOYG3079Hn6vj5SlqQ3c/hb1NtqZBhhoo H4Qg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=lmqkb90y; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a8si5658464edu.340.2021.02.05.11.02.40; Fri, 05 Feb 2021 11:03:05 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=lmqkb90y; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233739AbhBERSa (ORCPT + 99 others); Fri, 5 Feb 2021 12:18:30 -0500 Received: from Galois.linutronix.de ([193.142.43.55]:49558 "EHLO galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229690AbhBERQW (ORCPT ); Fri, 5 Feb 2021 12:16:22 -0500 Date: Fri, 05 Feb 2021 18:58:02 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1612551483; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ThxGWeqsK4d0OgDaQKX6wTkCCqd4OEQOPXa8W7M8KMI=; b=lmqkb90yslJwUq6k9d3C+9W1tAXghnftslInu/5XiO8mSL66QnyNsDeaxtMcLuut3yE2BG b6ocl4nR1cNYikicFujClRmLmXiJ7eMO0tORE4iot8hB0d3T37quGS7cr3RmdHVqVdpNaY kYEu6vDUqoeF4D592bJBlgstNz3Ib6XpN5rnwnZeI1Xm1m989RNGQ2+DsRGBAPjHZsm2cp yKuUsTC8vCj7leduNosct5NWv94SAvv3LATIVvX5t9nw7O6gZuexFhZgpTQsnpBgsnxKq6 38K2mI/tdXwmSLKeA5asLRAhpZqwh2rIHLS2FUD42uxTs8KsfwBrNSNjCPEK+g== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1612551483; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ThxGWeqsK4d0OgDaQKX6wTkCCqd4OEQOPXa8W7M8KMI=; b=OmJcRQZ3u5CW2iQZG78S78PCvQhgme65eshriqGTihyxxXDHJwdiCXCpMohF8gFMszjVj3 lp4TohkwvcVOuxCg== From: "tip-bot2 for Anand K Mistry" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/cleanups] x86/Kconfig: Remove HPET_EMULATE_RTC depends on RTC Cc: Anand K Mistry , Thomas Gleixner , Randy Dunlap , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20210204183205.1.If5c6ded53a00ecad6a02a1e974316291cc0239d1@changeid> References: <20210204183205.1.If5c6ded53a00ecad6a02a1e974316291cc0239d1@changeid> MIME-Version: 1.0 Message-ID: <161255148297.23325.11250667185160852143.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the x86/cleanups branch of tip: Commit-ID: 3228e1dc80983ee1f5d2e533d010b3bd8b50f0e2 Gitweb: https://git.kernel.org/tip/3228e1dc80983ee1f5d2e533d010b3bd8b50f0e2 Author: Anand K Mistry AuthorDate: Thu, 04 Feb 2021 18:32:32 +11:00 Committer: Thomas Gleixner CommitterDate: Fri, 05 Feb 2021 19:56:35 +01:00 x86/Kconfig: Remove HPET_EMULATE_RTC depends on RTC The RTC config option was removed in commit f52ef24be21a ("rtc/alpha: remove legacy rtc driver") Signed-off-by: Anand K Mistry Signed-off-by: Thomas Gleixner Reviewed-by: Randy Dunlap Link: https://lore.kernel.org/r/20210204183205.1.If5c6ded53a00ecad6a02a1e974316291cc0239d1@changeid --- arch/x86/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 7b6dd10..865c1e7 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -889,7 +889,7 @@ config HPET_TIMER config HPET_EMULATE_RTC def_bool y - depends on HPET_TIMER && (RTC=y || RTC=m || RTC_DRV_CMOS=m || RTC_DRV_CMOS=y) + depends on HPET_TIMER && (RTC_DRV_CMOS=m || RTC_DRV_CMOS=y) config APB_TIMER def_bool y if X86_INTEL_MID