Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/dtor/input

[pandora-kernel.git] / arch / arm / oprofile / Kconfig

diff --git a/arch/arm/oprofile/Kconfig b/arch/arm/oprofile/Kconfig
index 615a6b9..afd93ad 100644 (file)
--- a/arch/arm/oprofile/Kconfig
+++ b/arch/arm/oprofile/Kconfig
@@ -19,8 +19,24 @@ config OPROFILE
 
          If unsure, say N.
 
+if OPROFILE
+
+config OPROFILE_ARMV6
+       bool
+       depends on CPU_V6 && !SMP
+       default y
+       select OPROFILE_ARM11_CORE
+
+config OPROFILE_MPCORE
+       bool
+       depends on CPU_V6 && SMP
+       default y
+       select OPROFILE_ARM11_CORE
+
 config OPROFILE_ARM11_CORE
        bool
 
+endif
+
 endmenu