From 24a6f35e192ed54205024742eb8a4a2f99c1da9d Mon Sep 17 00:00:00 2001 From: Anna-Maria Gleixner Date: Fri, 18 May 2012 16:45:47 +0000 Subject: hexagon: Use generic time config config GENERIC_TIME not longer used. Signed-off-by: Anna-Maria Gleixner Cc: Richard Kuo Link: http://lkml.kernel.org/r/20120518163105.416570309@glx-um.de Signed-off-by: Thomas Gleixner --- arch/hexagon/Kconfig | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'arch/hexagon/Kconfig') diff --git a/arch/hexagon/Kconfig b/arch/hexagon/Kconfig index 9059e3905887..7727ed9d2bf3 100644 --- a/arch/hexagon/Kconfig +++ b/arch/hexagon/Kconfig @@ -28,6 +28,9 @@ config HEXAGON select NO_IOPORT select GENERIC_IOMAP # mostly generic routines, with some accelerated ones + select KTIME_SCALAR + select GENERIC_CLOCKEVENTS + select GENERIC_CLOCKEVENTS_BROADCAST ---help--- Qualcomm Hexagon is a processor architecture designed for high performance and low power across a wide variety of applications. @@ -56,9 +59,6 @@ config PCI config EARLY_PRINTK def_bool y -config KTIME_SCALAR - def_bool y - config MMU def_bool y @@ -98,15 +98,6 @@ config GENERIC_FIND_NEXT_BIT config GENERIC_HWEIGHT def_bool y -config GENERIC_TIME - def_bool y - -config GENERIC_CLOCKEVENTS - def_bool y - -config GENERIC_CLOCKEVENTS_BROADCAST - def_bool y - config STACKTRACE_SUPPORT def_bool y select STACKTRACE -- cgit From 764e0da14fd7ac2d259d98d34ece0a87d32306c9 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Mon, 21 May 2012 23:16:18 +0200 Subject: 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 Cc: Anna-Maria Gleixner Signed-off-by: Thomas Gleixner --- arch/hexagon/Kconfig | 1 - 1 file changed, 1 deletion(-) (limited to 'arch/hexagon/Kconfig') diff --git a/arch/hexagon/Kconfig b/arch/hexagon/Kconfig index 7727ed9d2bf3..35f6c32d040c 100644 --- a/arch/hexagon/Kconfig +++ b/arch/hexagon/Kconfig @@ -183,7 +183,6 @@ endchoice source "mm/Kconfig" source "kernel/Kconfig.hz" -source "kernel/time/Kconfig" config GENERIC_GPIO bool "Generic GPIO support" -- cgit