Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 9a23fe65cf36efc6cb40e96405a3f142c7732805

Authored by Daniel Lezcano
Committed by Rafael J. Wysocki
1 parent d2b578e5fc
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

cpuidle / kirkwood: remove redundant Kconfig option 

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>

Showing 3 changed files with 1 additions and 8 deletions Side-by-side Diff

arch/arm/configs/kirkwood_defconfig
Diff comments   View file @ 9a23fe6
... ... @@ -56,7 +56,6 @@
56 56 CONFIG_ZBOOT_ROM_TEXT=0x0
57 57 CONFIG_ZBOOT_ROM_BSS=0x0
58 58 CONFIG_CPU_IDLE=y
59   -CONFIG_CPU_IDLE_KIRKWOOD=y
60 59 CONFIG_NET=y
61 60 CONFIG_PACKET=y
62 61 CONFIG_UNIX=y
drivers/cpuidle/Kconfig
Diff comments   View file @ 9a23fe6
... ... @@ -39,11 +39,5 @@
39 39 help
40 40 Select this to enable cpuidle on Calxeda processors.
41 41  
42   -config CPU_IDLE_KIRKWOOD
43   - bool "CPU Idle Driver for Kirkwood processors"
44   - depends on ARCH_KIRKWOOD
45   - help
46   - Select this to enable cpuidle on Kirkwood processors.
47   -
48 42 endif
drivers/cpuidle/Makefile
Diff comments   View file @ 9a23fe6
... ... @@ -6,5 +6,5 @@
6 6 obj-$(CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED) += coupled.o
7 7  
8 8 obj-$(CONFIG_CPU_IDLE_CALXEDA) += cpuidle-calxeda.o
9   -obj-$(CONFIG_CPU_IDLE_KIRKWOOD) += cpuidle-kirkwood.o
  9 +obj-$(CONFIG_ARCH_KIRKWOOD) += cpuidle-kirkwood.o