Merge branches 'pm-cpufreq-fixes' and 'pm-cpuidle'

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

diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig
index 18b88779e701ed77088edcc0865bd25c6f060791..7e75d45e20cdf271ce8f0025fc362e3c37048dfd 100644 (file)
--- a/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
@@ -4,6 +4,7 @@ config AVR32
        # that we usually don't need on AVR32.
        select EXPERT
        select HAVE_CLK
+       select HAVE_EXIT_THREAD
        select HAVE_OPROFILE
        select HAVE_KPROBES
        select VIRT_TO_BUS
@@ -17,6 +18,7 @@ config AVR32
        select GENERIC_CLOCKEVENTS
        select HAVE_MOD_ARCH_SPECIFIC
        select MODULES_USE_ELF_RELA
+       select HAVE_NMI
        help
          AVR32 is a high-performance 32-bit RISC microprocessor core,
          designed for cost-sensitive embedded applications, with particular