summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-02-08 12:08:48 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-02-08 12:08:48 -0800
commitc132adef53739d9911326fc308d34045a0ea5446 (patch)
treec1fe83336e7a90c0aa537e427bb133c03d415ecd
parentc1ff84317f1e7ec57a54c0bff48d21a78d7096c1 (diff)
parent923fa4ea382f592dee2ba3b205befb90cbddf3af (diff)
downloadkernel-common-c132adef53739d9911326fc308d34045a0ea5446.tar.gz
kernel-common-c132adef53739d9911326fc308d34045a0ea5446.tar.bz2
kernel-common-c132adef53739d9911326fc308d34045a0ea5446.zip
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fix from Thomas Gleixner: "Add a missing Kconfig dependency" * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: genirq: Generic irq chip requires IRQ_DOMAIN
-rw-r--r--kernel/irq/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/irq/Kconfig b/kernel/irq/Kconfig
index 4a1fef09f658..07cbdfea9ae2 100644
--- a/kernel/irq/Kconfig
+++ b/kernel/irq/Kconfig
@@ -40,6 +40,7 @@ config IRQ_EDGE_EOI_HANDLER
# Generic configurable interrupt chip implementation
config GENERIC_IRQ_CHIP
bool
+ select IRQ_DOMAIN
# Generic irq_domain hw <--> linux irq number translation
config IRQ_DOMAIN