From patchwork Sun Jun 29 20:59:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Lunn X-Patchwork-Id: 4445141 X-Patchwork-Delegate: rui.zhang@intel.com 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 17BB1BEEAA for ; Sun, 29 Jun 2014 21:04:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4E8AA20353 for ; Sun, 29 Jun 2014 21:04:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2B81A20379 for ; Sun, 29 Jun 2014 21:04:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753540AbaF2VEq (ORCPT ); Sun, 29 Jun 2014 17:04:46 -0400 Received: from vps0.lunn.ch ([178.209.37.122]:38797 "EHLO vps0.lunn.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752940AbaF2VEn (ORCPT ); Sun, 29 Jun 2014 17:04:43 -0400 Received: from lunn by vps0.lunn.ch with local (Exim 4.80) (envelope-from ) id 1X1MCs-0008Ih-7J; Sun, 29 Jun 2014 23:00:14 +0200 From: Andrew Lunn To: Jason Cooper , Sebastian Hesselbarth Cc: Gregory Clement , rmk+kernel@arm.linux.org.uk, Andrew Lunn , Zhang Rui , linux-pm@vger.kernel.org Subject: [PATCH 07/13] thermal: Replace ARCH_KIRKWOOD and ARCH_DOVE dependency Date: Sun, 29 Jun 2014 22:59:56 +0200 Message-Id: <1404075603-31838-10-git-send-email-andrew@lunn.ch> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1404075603-31838-1-git-send-email-andrew@lunn.ch> References: <1404075603-31838-1-git-send-email-andrew@lunn.ch> 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, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 Both mach-kirkwood and mach-dove has been removed, now that these SoCs live in mach-mvebu. Depend on MACH_KIRKWOOD and MACH_DOVE, which will be set when these SoCs are built as part of ARCH_MVEBU. Signed-off-by: Andrew Lunn Cc: Zhang Rui Cc: linux-pm@vger.kernel.org --- drivers/thermal/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig index f9a13867cb70..a0f1371517ee 100644 --- a/drivers/thermal/Kconfig +++ b/drivers/thermal/Kconfig @@ -143,7 +143,7 @@ config RCAR_THERMAL config KIRKWOOD_THERMAL tristate "Temperature sensor on Marvell Kirkwood SoCs" - depends on ARCH_KIRKWOOD || MACH_KIRKWOOD + depends on MACH_KIRKWOOD depends on OF help Support for the Kirkwood thermal sensor driver into the Linux thermal @@ -151,7 +151,7 @@ config KIRKWOOD_THERMAL config DOVE_THERMAL tristate "Temperature sensor on Marvell Dove SoCs" - depends on ARCH_DOVE + depends on MACH_DOVE depends on OF help Support for the Dove thermal sensor driver in the Linux thermal