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/x86/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/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 79795af59810..5d3d61f40b31 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
| @@ -28,7 +28,6 @@ config X86 | |||
| 28 | select HAVE_OPROFILE | 28 | select HAVE_OPROFILE |
| 29 | select HAVE_PCSPKR_PLATFORM | 29 | select HAVE_PCSPKR_PLATFORM |
| 30 | select HAVE_PERF_EVENTS | 30 | select HAVE_PERF_EVENTS |
| 31 | select HAVE_IRQ_WORK | ||
| 32 | select HAVE_IOREMAP_PROT | 31 | select HAVE_IOREMAP_PROT |
| 33 | select HAVE_KPROBES | 32 | select HAVE_KPROBES |
| 34 | select HAVE_MEMBLOCK | 33 | select HAVE_MEMBLOCK |