Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[mirror_ubuntu-zesty-kernel.git] / arch / metag / Kconfig

diff --git a/arch/metag/Kconfig b/arch/metag/Kconfig
index 2099617e3ec0de7161dd224002e623848c6c66f9..6f16c14693272e593aa0f98d33e6b62d60f8ce79 100644 (file)
--- a/arch/metag/Kconfig
+++ b/arch/metag/Kconfig
@@ -21,6 +21,7 @@ config METAG
        select HAVE_MEMBLOCK
        select HAVE_MEMBLOCK_NODE_MAP
        select HAVE_MOD_ARCH_SPECIFIC
+       select HAVE_OPROFILE
        select HAVE_PERF_EVENTS
        select HAVE_SYSCALL_TRACEPOINTS
        select HAVE_UNDERSCORE_SYMBOL_PREFIX
@@ -206,6 +207,9 @@ config METAG_PERFCOUNTER_IRQS
          When disabled, Performance Counters information will be collected
          based on Timer Interrupt.
 
+config HW_PERF_EVENTS
+       def_bool METAG_PERFCOUNTER_IRQS && PERF_EVENTS
+
 config METAG_DA
        bool "DA support"
        help