summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2011-10-18 06:31:07 (GMT)
committerIngo Molnar <mingo@elte.hu>2011-10-18 06:31:07 (GMT)
commit47724df3375bf0cf652039ab6b7ded29fe877de6 (patch)
tree0807a74e96f63c5188cb5c67b3ffa8a55bd28b4f
parentee8f967b15179c34b923c9b87c06984e682b24cf (diff)
parentabcefec31e3dc46554ee9c04f70c6012b17e8dc5 (diff)
downloadlinux-fsl-qoriq-47724df3375bf0cf652039ab6b7ded29fe877de6.tar.xz
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core
-rw-r--r--arch/m32r/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig
index b92b944..6c4e9aa 100644
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
@@ -10,6 +10,7 @@ config M32R
select HAVE_GENERIC_HARDIRQS
select GENERIC_IRQ_PROBE
select GENERIC_IRQ_SHOW
+ select GENERIC_ATOMIC64
config SBUS
bool