Message ID | 1409417172-6846-2-git-send-email-andrew@lunn.ch (mailing list archive) |
---|---|
State | Not Applicable, archived |
Headers | show |
On 08/30/2014 06:46 PM, Andrew Lunn wrote: > 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 <andrew@lunn.ch> > Cc: Daniel Lezcano <daniel.lezcano@linaro.org> > Cc: Rafael J. Wysocki <rjw@rjwysocki.net> > Cc: linux-pm@vger.kernel.org Acked-by: Daniel Lezcano <daniel.lezcano@linaro.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 38cff69ffe06..58bcd0d166ec 100644 > --- a/drivers/cpuidle/Kconfig.arm > +++ b/drivers/cpuidle/Kconfig.arm > @@ -28,7 +28,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. > >
diff --git a/drivers/cpuidle/Kconfig.arm b/drivers/cpuidle/Kconfig.arm index 38cff69ffe06..58bcd0d166ec 100644 --- a/drivers/cpuidle/Kconfig.arm +++ b/drivers/cpuidle/Kconfig.arm @@ -28,7 +28,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.
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 <andrew@lunn.ch> Cc: Daniel Lezcano <daniel.lezcano@linaro.org> Cc: Rafael J. Wysocki <rjw@rjwysocki.net> Cc: linux-pm@vger.kernel.org --- drivers/cpuidle/Kconfig.arm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)