diff options
| author | Tony Lindgren <tony@atomide.com> | 2014-02-28 13:35:02 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2014-02-28 13:35:02 -0800 |
| commit | 9594274201ac3c67d5c569aae63792e58bcd33e6 (patch) | |
| tree | e5b4eead06199bbd608142906fe571c293ac50ab /include/linux | |
| parent | 38dbfb59d1175ef458d006556061adeaa8751b72 (diff) | |
| parent | 5c61e61966076406a1ab238f5b8588a0caa26c16 (diff) | |
Merge branch 'crossbar_3.14_rc1' of git://github.com/Sricharanti/sricharan into omap-for-v3.15/crossbar
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/irqchip/arm-gic.h | 7 | ||||
| -rw-r--r-- | include/linux/irqchip/irq-crossbar.h | 11 |
2 files changed, 17 insertions, 1 deletions
diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h index 0ceb389dba6c..7ed92d0560d5 100644 --- a/include/linux/irqchip/arm-gic.h +++ b/include/linux/irqchip/arm-gic.h @@ -93,6 +93,11 @@ int gic_get_cpu_id(unsigned int cpu); void gic_migrate_target(unsigned int new_cpu_id); unsigned long gic_get_sgir_physaddr(void); +extern const struct irq_domain_ops *gic_routable_irq_domain_ops; +static inline void __init register_routable_domain_ops + (const struct irq_domain_ops *ops) +{ + gic_routable_irq_domain_ops = ops; +} #endif /* __ASSEMBLY */ - #endif diff --git a/include/linux/irqchip/irq-crossbar.h b/include/linux/irqchip/irq-crossbar.h new file mode 100644 index 000000000000..e5537b81df8d --- /dev/null +++ b/include/linux/irqchip/irq-crossbar.h @@ -0,0 +1,11 @@ +/* + * drivers/irqchip/irq-crossbar.h + * + * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + */ +int irqcrossbar_init(void); |