From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Lunn Subject: [PATCH v2 05/12] cpuidle: kirkwood: Remove ARCH_KIRKWOOD dependency Date: Thu, 10 Jul 2014 23:36:25 +0200 Message-ID: <1405028192-9623-6-git-send-email-andrew@lunn.ch> References: <1405028192-9623-1-git-send-email-andrew@lunn.ch> Return-path: Received: from vps0.lunn.ch ([178.209.37.122]:45796 "EHLO vps0.lunn.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751337AbaGJVmS (ORCPT ); Thu, 10 Jul 2014 17:42:18 -0400 In-Reply-To: <1405028192-9623-1-git-send-email-andrew@lunn.ch> Sender: linux-pm-owner@vger.kernel.org List-Id: linux-pm@vger.kernel.org To: Jason Cooper Cc: linux ARM , Gregory Clement , Sebastian Hesselbarth , Andrew Lunn , Daniel Lezcano , "Rafael J. Wysocki" , linux-pm@vger.kernel.org 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. -- 2.0.1