From patchwork Sun Jun 29 20:59:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Lunn X-Patchwork-Id: 4445151 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id DA9DE9F32E for ; Sun, 29 Jun 2014 21:05:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0AA6020353 for ; Sun, 29 Jun 2014 21:05:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3C4322020F for ; Sun, 29 Jun 2014 21:05:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753582AbaF2VFE (ORCPT ); Sun, 29 Jun 2014 17:05:04 -0400 Received: from vps0.lunn.ch ([178.209.37.122]:38848 "EHLO vps0.lunn.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753398AbaF2VFD (ORCPT ); Sun, 29 Jun 2014 17:05:03 -0400 Received: from lunn by vps0.lunn.ch with local (Exim 4.80) (envelope-from ) id 1X1MCs-0008IZ-5a; 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 , Daniel Lezcano , "Rafael J. Wysocki" , linux-pm@vger.kernel.org Subject: [PATCH 05/13] cpuidle: kirkwood: Replace ARCH_KIRKWOOD dependency Date: Sun, 29 Jun 2014 22:59:54 +0200 Message-Id: <1404075603-31838-8-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=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 mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu. Use MACH_KIRKWOOD, which is set when kirkwood is built as part of mach-mvebu. Signed-off-by: Andrew Lunn Cc: Daniel Lezcano Cc: Rafael J. Wysocki Cc: linux-pm@vger.kernel.org --- drivers/cpuidle/Kconfig.arm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/cpuidle/Kconfig.arm b/drivers/cpuidle/Kconfig.arm index b6d69e899f5d..dd9afb405766 100644 --- a/drivers/cpuidle/Kconfig.arm +++ b/drivers/cpuidle/Kconfig.arm @@ -33,7 +33,7 @@ config ARM_HIGHBANK_CPUIDLE config ARM_KIRKWOOD_CPUIDLE bool "CPU Idle Driver for Marvell Kirkwood SoCs" - depends on ARCH_KIRKWOOD || MACH_KIRKWOOD + depends on MACH_KIRKWOOD help This adds the CPU Idle driver for Marvell Kirkwood SoCs.