diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2012-05-21 23:16:18 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2012-05-21 23:43:46 +0200 |
| commit | 764e0da14fd7ac2d259d98d34ece0a87d32306c9 (patch) | |
| tree | 3d1c3065ca2f140f065c15c0b9645703241c68e7 /arch/um/Kconfig.um | |
| parent | bdebaf80a02b854381fe212e0dac13c8c8edac57 (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/um/Kconfig.um')
| -rw-r--r-- | arch/um/Kconfig.um | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/um/Kconfig.um b/arch/um/Kconfig.um index 70fd690964e..bf87f25eb2d 100644 --- a/arch/um/Kconfig.um +++ b/arch/um/Kconfig.um @@ -10,7 +10,6 @@ config STATIC_LINK 2.75G) for UML. source "mm/Kconfig" -source "kernel/time/Kconfig" config LD_SCRIPT_STATIC bool |