diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2011-10-18 08:31:07 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-10-18 08:31:07 +0200 |
| commit | 47724df3375bf0cf652039ab6b7ded29fe877de6 (patch) | |
| tree | 0807a74e96f63c5188cb5c67b3ffa8a55bd28b4f | |
| parent | Merge branch 'perf/core' of git://github.com/acmel/linux into perf/core (diff) | |
| parent | m32r: Allow use of atomic64 (diff) | |
| download | linux-dev-47724df3375bf0cf652039ab6b7ded29fe877de6.tar.xz linux-dev-47724df3375bf0cf652039ab6b7ded29fe877de6.zip | |
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/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig index b92b9445255d..6c4e9aaa70c1 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 |