aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2012-05-21 17:16:18 -0400
committerThomas Gleixner <tglx@linutronix.de>2012-05-21 17:43:46 -0400
commit764e0da14fd7ac2d259d98d34ece0a87d32306c9 (patch)
tree3d1c3065ca2f140f065c15c0b9645703241c68e7 /arch/sh
parentbdebaf80a02b854381fe212e0dac13c8c8edac57 (diff)
timers: Fixup the Kconfig consolidation fallout
Sigh, I missed to check which architecture Kconfig files actually include the core Kconfig file. There are a few which did not. So we broke them. Instead of adding the includes to those, we are better off to move the include to init/Kconfig like we did already with irqs and others. This does not change anything for the architectures using the old style periodic timer mode. It just solves the build wreckage there. For those architectures which use the clock events infrastructure it moves the include of the core Kconfig file to "General setup" which is a way more logical place than having it at random locations specified by the architecture specific Kconfigs. Reported-by: Ingo Molnar <mingo@kernel.org> Cc: Anna-Maria Gleixner <anna-maria@glx-um.de> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/sh')
-rw-r--r--arch/sh/Kconfig3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index cffd8b0082d5..820dfe3c7b69 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -577,9 +577,6 @@ config SH_CLK_CPG_LEGACY
577 depends on SH_CLK_CPG 577 depends on SH_CLK_CPG
578 def_bool y if !CPU_SUBTYPE_SH7785 && !ARCH_SHMOBILE && \ 578 def_bool y if !CPU_SUBTYPE_SH7785 && !ARCH_SHMOBILE && \
579 !CPU_SHX3 && !CPU_SUBTYPE_SH7757 579 !CPU_SHX3 && !CPU_SUBTYPE_SH7757
580
581source "kernel/time/Kconfig"
582
583endmenu 580endmenu
584 581
585menu "CPU Frequency scaling" 582menu "CPU Frequency scaling"