Merge branch 'work.gfs2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-microblaze.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index f1d6531..9986302 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -126,6 +126,7 @@ config ARM
        select RTC_LIB
        select SET_FS
        select SYS_SUPPORTS_APM_EMULATION
+       select TRACE_IRQFLAGS_SUPPORT if !CPU_V7M
        # Above selects are sorted alphabetically; please add new ones
        # according to that.  Thanks.
        help
@@ -189,10 +190,6 @@ config LOCKDEP_SUPPORT
        bool
        default y
 
-config TRACE_IRQFLAGS_SUPPORT
-       bool
-       default !CPU_V7M
-
 config ARCH_HAS_ILOG2_U32
        bool