aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-10-01 13:28:09 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-01 13:28:09 -0400
commit7a68294278ae714ce2632a54f0f46916dca64f56 (patch)
tree78f22ea7dcfa22cbb354ba1cab6c9824a380aad5
parent627312b9a877983f2164a67d042541ec1ffc435b (diff)
parent17d83127d4c2b322dd8f217e0ac08c66eb403779 (diff)
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull trivial irq core update from Ingo Molnar: "Two symbol exports for modular irq-chip drivers" * 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: genirq: Export dummy_irq_chip genirq: Export irq_set_chip_and_handler_name()
-rw-r--r--kernel/irq/chip.c1
-rw-r--r--kernel/irq/dummychip.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index eebd6d5cfb44..57d86d07221e 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -671,6 +671,7 @@ irq_set_chip_and_handler_name(unsigned int irq, struct irq_chip *chip,
671 irq_set_chip(irq, chip); 671 irq_set_chip(irq, chip);
672 __irq_set_handler(irq, handle, 0, name); 672 __irq_set_handler(irq, handle, 0, name);
673} 673}
674EXPORT_SYMBOL_GPL(irq_set_chip_and_handler_name);
674 675
675void irq_modify_status(unsigned int irq, unsigned long clr, unsigned long set) 676void irq_modify_status(unsigned int irq, unsigned long clr, unsigned long set)
676{ 677{
diff --git a/kernel/irq/dummychip.c b/kernel/irq/dummychip.c
index b5fcd96c7102..988dc58e8847 100644
--- a/kernel/irq/dummychip.c
+++ b/kernel/irq/dummychip.c
@@ -6,6 +6,7 @@
6 */ 6 */
7#include <linux/interrupt.h> 7#include <linux/interrupt.h>
8#include <linux/irq.h> 8#include <linux/irq.h>
9#include <linux/export.h>
9 10
10#include "internals.h" 11#include "internals.h"
11 12
@@ -57,3 +58,4 @@ struct irq_chip dummy_irq_chip = {
57 .irq_mask = noop, 58 .irq_mask = noop,
58 .irq_unmask = noop, 59 .irq_unmask = noop,
59}; 60};
61EXPORT_SYMBOL_GPL(dummy_irq_chip);