From 8d6af9914cacfbb60537cf5c46f9ebfc26ff2440 Mon Sep 17 00:00:00 2001 From: Anna-Maria Gleixner Date: Fri, 18 May 2012 16:45:45 +0000 Subject: avr32: Use generic time config Signed-off-by: Anna-Maria Gleixner Cc: Haavard Skinnemoen Link: http://lkml.kernel.org/r/20120518163104.889514832@glx-um.de Signed-off-by: Thomas Gleixner --- arch/avr32/Kconfig | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'arch/avr32/Kconfig') diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig index 3dea7231..0bd13ab 100644 --- a/arch/avr32/Kconfig +++ b/arch/avr32/Kconfig @@ -12,6 +12,7 @@ config AVR32 select HARDIRQS_SW_RESEND select GENERIC_IRQ_SHOW select ARCH_HAVE_NMI_SAFE_CMPXCHG + select GENERIC_CLOCKEVENTS help AVR32 is a high-performance 32-bit RISC microprocessor core, designed for cost-sensitive embedded applications, with particular @@ -35,9 +36,6 @@ config TRACE_IRQFLAGS_SUPPORT config RWSEM_GENERIC_SPINLOCK def_bool y -config GENERIC_CLOCKEVENTS - def_bool y - config RWSEM_XCHGADD_ALGORITHM def_bool n -- cgit v1.1 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/avr32/Kconfig | 2 -- 1 file changed, 2 deletions(-) (limited to 'arch/avr32/Kconfig') diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig index 0bd13ab..f8bc2d2 100644 --- a/arch/avr32/Kconfig +++ b/arch/avr32/Kconfig @@ -61,8 +61,6 @@ source "kernel/Kconfig.freezer" menu "System Type and features" -source "kernel/time/Kconfig" - config SUBARCH_AVR32B bool config MMU -- cgit v1.1