diff options
author | Ingo Molnar <mingo@kernel.org> | 2013-10-04 09:59:13 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-10-04 09:59:13 +0200 |
commit | fafd883f671dfc1c2f62009179920f27abc784a1 (patch) | |
tree | 0eccb0baf343cad79a54e352598921db9ca17620 /arch/parisc/Kconfig | |
parent | 92519bbc8af612975410def52bd462ca9af85cdb (diff) | |
parent | d8b11a0cbd1c66ce283eb9dabe0498dfa6483f32 (diff) |
Merge branch 'perf/urgent' into perf/core
Pick up the latest fixes before applying new patches.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/parisc/Kconfig')
-rw-r--r-- | arch/parisc/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig index aa399a5259b6..ad2ce8dab996 100644 --- a/arch/parisc/Kconfig +++ b/arch/parisc/Kconfig @@ -14,7 +14,6 @@ config PARISC select HAVE_PERF_EVENTS select GENERIC_ATOMIC64 if !64BIT select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE - select HAVE_GENERIC_HARDIRQS select BROKEN_RODATA select GENERIC_IRQ_PROBE select GENERIC_PCI_IOMAP |