cpuidle / kirkwood: remove redundant Kconfig option (9a23fe65) · Commits · 戴 / test

When the CPU_IDLE and the ARCH_KIRKWOOD options are set it is pointless to define a new option CPU_IDLE_KIRKWOOD because it is redundant. The Makefile drivers directory contains a condition to compile the cpuidle drivers: obj-$(CONFIG_CPU_IDLE) += cpuidle/ Hence, if CPU_IDLE is not set we won't enter this directory. This patch removes the useless Kconfig option and replaces the condition in the Makefile by CONFIG_ARCH_KIRKWOOD. Signed-off-by:

Daniel Lezcano <daniel.lezcano@linaro.org> Acked-by:

Jason Cooper <jason@lakedaemon.net> Signed-off-by:

Rafael J. Wysocki <rafael.j.wysocki@intel.com>

arch/arm/configs/kirkwood_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -56,7 +56,6 @@ CONFIG_AEABI=y
		CONFIG_ZBOOT_ROM_TEXT=0x0
		CONFIG_ZBOOT_ROM_BSS=0x0
		CONFIG_CPU_IDLE=y
		CONFIG_CPU_IDLE_KIRKWOOD=y
		CONFIG_NET=y
		CONFIG_PACKET=y
		CONFIG_UNIX=y

drivers/cpuidle/Kconfig

+0 −6

Original line number	Diff line number	Diff line
		@@ -39,10 +39,4 @@ config CPU_IDLE_CALXEDA
		help
		Select this to enable cpuidle on Calxeda processors.

		config CPU_IDLE_KIRKWOOD
		bool "CPU Idle Driver for Kirkwood processors"
		depends on ARCH_KIRKWOOD
		help
		Select this to enable cpuidle on Kirkwood processors.

		endif

drivers/cpuidle/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -6,4 +6,4 @@ obj-y += cpuidle.o driver.o governor.o sysfs.o governors/
		obj-$(CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED) += coupled.o

		obj-$(CONFIG_CPU_IDLE_CALXEDA) += cpuidle-calxeda.o
		obj-$(CONFIG_CPU_IDLE_KIRKWOOD) += cpuidle-kirkwood.o
		obj-$(CONFIG_ARCH_KIRKWOOD) += cpuidle-kirkwood.o

Admin message