diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-01-24 06:48:41 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-01-24 06:48:41 -0500 |
| commit | 786133f6e8ff94aaa78cd6b7844d04c227098327 (patch) | |
| tree | be5922c90ec74267bf068987e4de14a6436d04de /arch/s390/Kconfig | |
| parent | befddb21c845f8fb49e637997891ef97c6a869dc (diff) | |
| parent | 6147a9d8070e1c9d16d57eb53a14942b95b28dc4 (diff) | |
Merge branch 'core/irq_work' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks into irq/core
irq_work fixes and cleanups, in preparation for full dyntics support.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/s390/Kconfig')
| -rw-r--r-- | arch/s390/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index b5ea38c25647..c15ba7d1be64 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig | |||
| @@ -78,7 +78,6 @@ config S390 | |||
| 78 | select HAVE_KVM if 64BIT | 78 | select HAVE_KVM if 64BIT |
| 79 | select HAVE_ARCH_TRACEHOOK | 79 | select HAVE_ARCH_TRACEHOOK |
| 80 | select INIT_ALL_POSSIBLE | 80 | select INIT_ALL_POSSIBLE |
| 81 | select HAVE_IRQ_WORK | ||
| 82 | select HAVE_PERF_EVENTS | 81 | select HAVE_PERF_EVENTS |
| 83 | select ARCH_HAVE_NMI_SAFE_CMPXCHG | 82 | select ARCH_HAVE_NMI_SAFE_CMPXCHG |
| 84 | select HAVE_DEBUG_KMEMLEAK | 83 | select HAVE_DEBUG_KMEMLEAK |