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

[linux-2.6-block.git] / arch / metag / Kconfig

diff --git a/arch/metag/Kconfig b/arch/metag/Kconfig
index 0e97f5c50ff487a8c5443c9f9ced73b60f7a1c5b..dcd94406030e3e9cebd2a15a01260c389d2d24a8 100644 (file)
--- a/arch/metag/Kconfig
+++ b/arch/metag/Kconfig
@@ -1,7 +1,3 @@
-config SYMBOL_PREFIX
-       string
-       default "_"
-
 config METAG
        def_bool y
        select EMBEDDED
@@ -25,8 +21,10 @@ 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
        select IRQ_DOMAIN
        select MODULES_USE_ELF_RELA
        select OF
@@ -206,6 +204,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