Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 764e0da1 authored May 21, 2012 by Thomas Gleixner

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>

parent bdebaf80

arch/arm/Kconfig

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1459,8 +1459,6 @@ endmenu

	menu "Kernel Features"		menu "Kernel Features"

	source "kernel/time/Kconfig"

	config HAVE_SMP		config HAVE_SMP
	bool		bool
	help		help

arch/avr32/Kconfig

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -61,8 +61,6 @@ source "kernel/Kconfig.freezer"

	menu "System Type and features"		menu "System Type and features"

	source "kernel/time/Kconfig"

	config SUBARCH_AVR32B		config SUBARCH_AVR32B
	bool		bool
	config MMU		config MMU

arch/blackfin/Kconfig

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -631,8 +631,6 @@ config GPTMR0_CLOCKSOURCE
	depends on !TICKSOURCE_GPTMR0		depends on !TICKSOURCE_GPTMR0
	endmenu		endmenu

	source kernel/time/Kconfig

	comment "Misc"		comment "Misc"

	choice		choice

arch/c6x/Kconfig

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -132,7 +132,6 @@ source "mm/Kconfig"
	source "kernel/Kconfig.preempt"		source "kernel/Kconfig.preempt"

	source "kernel/Kconfig.hz"		source "kernel/Kconfig.hz"
	source "kernel/time/Kconfig"

	endmenu		endmenu

arch/h8300/Kconfig.cpu

+0 −2

Original line number	Original line	Diff line number	Diff line
	menu "Processor type and features"		menu "Processor type and features"

	source "kernel/time/Kconfig"

	choice		choice
	prompt "H8/300 platform"		prompt "H8/300 platform"
	default H8300H_GENERIC		default H8300H_GENERIC