diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-10-18 02:31:07 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-10-18 02:31:07 -0400 |
| commit | 47724df3375bf0cf652039ab6b7ded29fe877de6 (patch) | |
| tree | 0807a74e96f63c5188cb5c67b3ffa8a55bd28b4f | |
| parent | ee8f967b15179c34b923c9b87c06984e682b24cf (diff) | |
| parent | abcefec31e3dc46554ee9c04f70c6012b17e8dc5 (diff) | |
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 | |||
| 10 | select HAVE_GENERIC_HARDIRQS | 10 | select HAVE_GENERIC_HARDIRQS |
| 11 | select GENERIC_IRQ_PROBE | 11 | select GENERIC_IRQ_PROBE |
| 12 | select GENERIC_IRQ_SHOW | 12 | select GENERIC_IRQ_SHOW |
| 13 | select GENERIC_ATOMIC64 | ||
| 13 | 14 | ||
| 14 | config SBUS | 15 | config SBUS |
| 15 | bool | 16 | bool |