Merge branch 'linus' into core/printk

[linux-2.6-omap-h63xx.git] / arch / avr32 / Kconfig

diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig
index c75d7089f982bba957ced3680d4d2bf9b52f56d3..09ad7995080c879cc4b944cf671484ac24746830 100644 (file)
--- a/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
@@ -10,7 +10,6 @@ config AVR32
        # With EMBEDDED=n, we get lots of stuff automatically selected
        # that we usually don't need on AVR32.
        select EMBEDDED
-       select HAVE_IDE
        select HAVE_OPROFILE
        select HAVE_KPROBES
        help
@@ -48,6 +47,9 @@ config RWSEM_GENERIC_SPINLOCK
 config GENERIC_TIME
        def_bool y
 
+config GENERIC_CLOCKEVENTS
+       def_bool y
+
 config RWSEM_XCHGADD_ALGORITHM
        def_bool n
 
@@ -71,6 +73,8 @@ source "init/Kconfig"
 
 menu "System Type and features"
 
+source "kernel/time/Kconfig"
+
 config SUBARCH_AVR32B
        bool
 config MMU