From patchwork Mon Feb 29 16:04:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 8455441 X-Patchwork-Delegate: rjw@sisk.pl Return-Path: X-Original-To: patchwork-linux-pm@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 3219AC0553 for ; Mon, 29 Feb 2016 16:05:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4D9F22022D for ; Mon, 29 Feb 2016 16:05:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 330602021B for ; Mon, 29 Feb 2016 16:05:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751457AbcB2QFB (ORCPT ); Mon, 29 Feb 2016 11:05:01 -0500 Received: from mout.kundenserver.de ([217.72.192.74]:60642 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751340AbcB2QFA (ORCPT ); Mon, 29 Feb 2016 11:05:00 -0500 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue103) with ESMTPA (Nemesis) id 0Mb2OB-1aLm8U0NrP-00KhQt; Mon, 29 Feb 2016 17:04:29 +0100 From: Arnd Bergmann To: "Rafael J. Wysocki" , Viresh Kumar Cc: linux-arm-kernel@lists.infradead.org, Arnd Bergmann , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] cpufreq: qoriq: allow building as module with THERMAL=m Date: Mon, 29 Feb 2016 17:04:20 +0100 Message-Id: <1456761867-1742824-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 X-Provags-ID: V03:K0:NUC7nbW2BIcxE47rICmeNJKuPX/ATKSBQdL7s/EM748Q+k4ZodU PzzsLg7+wXEeBVzKM3UJCPotRZXsaoJkgOlyvpWv5k3uSI+FauPP1NWGAahLjxAUrrRsrJV WvqxhMpYLDbe/gS5MeSA9vzYThZ3V0mQGm5j59pi2WKefcDy7EvwC1EMzqqMs7UrOoLnc7f I8ESiRAKBg5U8aNor62tQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:qXvYOLu75d0=:+ue3vA+y/WQaNlg1vcd247 +OdVYx8k1MIWmwHQ9g62URp+XOzeF058cxMaz4YwmPsToX5cSectzXb7SWMDDmJ3NkZOLxOjP Vwyr6odbsifWnIxuANYBBJtH528+hoPH0IOXv6DFyXvWhcSKcIN8pCZkavGuRP4OhUmUtkMdw G3Uf3Z08WeEJFnIJh+YaCZtwnSK2iOXVndXNE1gUgqM1vXTJpBlSY8EJNYykOjtRRCKW1kzVg tCyKTVbPYkZCtZyaQCfEUbpi1KJmWt/ouXhTtCVadlFesnrIMaZCJ7UJM5Di85fbTGPPQ1CWC CrmQU4KnhpkS8gzQphAFmsF/FtXGHj26FE0Wwbe/Q5p21ijVwMoKviaCdioEx95KcuyMkP8n0 RCTjcvyhKAVe2MKhJMUZYk3WlK+S2jhp37sSQ1MH8VVLM1DKzIWEu870EhRWL+1Brc6tmPTmc q/Ywk55TEqz2kAPoFrNtgUXKReg/SZXK/MwMm6C8/mr5WJH2Gx6WVN/jrYAuhg5JDZyjOdRMo 4Plx1YtvZT5h67EuQaLZnGX3xiVY5ngKQC/aAsH0QMjxBFDVoMzR67C8Di62VYn4CJGrvanbl /dVK5drYbdIlSBzgm8M3icHN1/fLZ96yJ+dMRlomhO9qmKdSP6geOkQAAhap5/Nr9c/+e2uZx E2CpPvmF3Td1Cxyg3vsrxQc67Z5iFn+77iDVM0npayCpY4jRRKi0/iql87VBGpNV4hf4= Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-6.9 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 My previous patch to avoid link errors with the qoriq cpufreq driver disallowed all of the broken cases, but also prevented the driver from being built when CONFIG_THERMAL is a module. This changes the dependency to allow the cpufreq driver to also be a module in this case, just not built-in. Signed-off-by: Arnd Bergmann Fixes: cpufreq: qoriq depends on thermal Acked-by: Viresh Kumar --- If possible, please fold this change directly into the previous commit drivers/cpufreq/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig index ca05037dd565..d5e11d24f72b 100644 --- a/drivers/cpufreq/Kconfig +++ b/drivers/cpufreq/Kconfig @@ -297,7 +297,7 @@ endif config QORIQ_CPUFREQ tristate "CPU frequency scaling driver for Freescale QorIQ SoCs" depends on OF && COMMON_CLK && (PPC_E500MC || ARM) - depends on !CPU_THERMAL || THERMAL=y + depends on !CPU_THERMAL || THERMAL select CLK_QORIQ help This adds the CPUFreq driver support for Freescale QorIQ SoCs