diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-21 23:33:19 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-21 23:33:19 -0400 |
| commit | 471368557a734c6c486ee757952c902b36e7fd01 (patch) | |
| tree | f192a77d2cb70b1d135e7be62418806e8c590a3e /arch/hexagon | |
| parent | cb60e3e65c1b96a4d6444a7a13dc7dd48bc15a2b (diff) | |
| parent | e0d8ffd1df44518cb9ac9b1807d1f13cc100fc2f (diff) | |
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull core irq changes from Ingo Molnar:
"A collection of small fixes."
By Thomas Gleixner
* 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
hexagon: Remove select of not longer existing Kconfig switches
arm: Select core options instead of redefining them
genirq: Do not consider disabled wakeup irqs
genirq: Allow check_wakeup_irqs to notice level-triggered interrupts
genirq: Be more informative on irq type mismatch
genirq: Reject bogus threaded irq requests
genirq: Streamline irq_action
Diffstat (limited to 'arch/hexagon')
| -rw-r--r-- | arch/hexagon/Kconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/hexagon/Kconfig b/arch/hexagon/Kconfig index d2e4a3330336..22615dd02219 100644 --- a/arch/hexagon/Kconfig +++ b/arch/hexagon/Kconfig | |||
| @@ -18,8 +18,6 @@ config HEXAGON | |||
| 18 | select GENERIC_ATOMIC64 | 18 | select GENERIC_ATOMIC64 |
| 19 | select HAVE_PERF_EVENTS | 19 | select HAVE_PERF_EVENTS |
| 20 | select HAVE_GENERIC_HARDIRQS | 20 | select HAVE_GENERIC_HARDIRQS |
| 21 | select GENERIC_HARDIRQS_NO__DO_IRQ | ||
| 22 | select GENERIC_HARDIRQS_NO_DEPRECATED | ||
| 23 | # GENERIC_ALLOCATOR is used by dma_alloc_coherent() | 21 | # GENERIC_ALLOCATOR is used by dma_alloc_coherent() |
| 24 | select GENERIC_ALLOCATOR | 22 | select GENERIC_ALLOCATOR |
| 25 | select GENERIC_IRQ_SHOW | 23 | select GENERIC_IRQ_SHOW |