diff options
author | Jason Cooper <jason@lakedaemon.net> | 2014-07-18 20:58:34 +0000 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2014-07-18 20:58:34 +0000 |
commit | f0cf9d2facbe3aa93b302058c013729cbc1bca22 (patch) | |
tree | 272bdf38e50d723fc88ef1fa068582087b6b8b27 /kernel/irq | |
parent | 20c0c607605244dd237707bb07e7f2ffd82e8aa5 (diff) | |
parent | 6704d12d688192366f3a70e6f8a85cb5a869cd5a (diff) | |
download | op-kernel-dev-f0cf9d2facbe3aa93b302058c013729cbc1bca22.zip op-kernel-dev-f0cf9d2facbe3aa93b302058c013729cbc1bca22.tar.gz |
Merge branch 'irqchip/atmel-aic' into irqchip/core
Topic branch set up to facilitate merging the rest of the series which
removes the driver from arch code.
Diffstat (limited to 'kernel/irq')
-rw-r--r-- | kernel/irq/generic-chip.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/irq/generic-chip.c b/kernel/irq/generic-chip.c index 452d6f2..cf80e7b 100644 --- a/kernel/irq/generic-chip.c +++ b/kernel/irq/generic-chip.c @@ -341,8 +341,8 @@ static struct lock_class_key irq_nested_lock_class; /* * irq_map_generic_chip - Map a generic chip for an irq domain */ -static int irq_map_generic_chip(struct irq_domain *d, unsigned int virq, - irq_hw_number_t hw_irq) +int irq_map_generic_chip(struct irq_domain *d, unsigned int virq, + irq_hw_number_t hw_irq) { struct irq_data *data = irq_get_irq_data(virq); struct irq_domain_chip_generic *dgc = d->gc; @@ -394,6 +394,7 @@ static int irq_map_generic_chip(struct irq_domain *d, unsigned int virq, irq_modify_status(virq, dgc->irq_flags_to_clear, dgc->irq_flags_to_set); return 0; } +EXPORT_SYMBOL_GPL(irq_map_generic_chip); struct irq_domain_ops irq_generic_chip_ops = { .map = irq_map_generic_chip, |