Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6

[cascardo/linux.git] / arch / avr32 / Kconfig

diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig
index 859b2de..71d38c7 100644 (file)
--- a/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
@@ -13,6 +13,7 @@ config AVR32
        select GENERIC_IRQ_SHOW
        select ARCH_HAVE_CUSTOM_GPIO_H
        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
@@ -36,9 +37,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
 
@@ -64,8 +62,6 @@ source "kernel/Kconfig.freezer"
 
 menu "System Type and features"
 
-source "kernel/time/Kconfig"
-
 config SUBARCH_AVR32B
        bool
 config MMU