From f39d87ada2aa8bd2d79d5f887eba6bde9d51c623 Mon Sep 17 00:00:00 2001 From: Anna-Maria Gleixner Date: Fri, 18 May 2012 16:45:45 +0000 Subject: [PATCH] --- yaml --- r: 307595 b: refs/heads/master c: 8d6af9914cacfbb60537cf5c46f9ebfc26ff2440 h: refs/heads/master i: 307593: 980bc377f935dd71f05426ca97c7988c0aff64a5 307591: 662dd3ecb3efb66dcdc1cf55ccf704887ee4bfb8 v: v3 --- [refs] | 2 +- trunk/arch/avr32/Kconfig | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 704a1c0c8a32..c19a72eb1245 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3d92a71a4467681ef6a47e10447d200b52c78af8 +refs/heads/master: 8d6af9914cacfbb60537cf5c46f9ebfc26ff2440 diff --git a/trunk/arch/avr32/Kconfig b/trunk/arch/avr32/Kconfig index 3dea7231f637..0bd13ab9f43b 100644 --- a/trunk/arch/avr32/Kconfig +++ b/trunk/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