diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-16 15:20:40 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-16 15:20:40 -0800 |
| commit | 3c6847eaa3da59f3bbe15eb3004ddab41ae6a201 (patch) | |
| tree | 9a33b100efeaa63fab23662eb0db42385b8d1f10 /include/linux/irqchip | |
| parent | 37507717de51a8332a34ee07fd88700be88df5bf (diff) | |
| parent | 4fe7ffb7e17ca6ad9173b8de35f260c9c8fc2f79 (diff) | |
| download | linux-3c6847eaa3da59f3bbe15eb3004ddab41ae6a201.tar.gz linux-3c6847eaa3da59f3bbe15eb3004ddab41ae6a201.tar.bz2 linux-3c6847eaa3da59f3bbe15eb3004ddab41ae6a201.zip | |
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irqchip updates from Ingo Molnar:
"Various irqchip driver updates, plus a genirq core update that allows
the initial spreading of irqs amonst CPUs without having to do it from
user-space"
* 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
genirq: Fix null pointer reference in irq_set_affinity_hint()
irqchip: gic: Allow interrupt level to be set for PPIs
irqchip: mips-gic: Handle pending interrupts once in __gic_irq_dispatch()
irqchip: Conexant CX92755 interrupts controller driver
irqchip: Devicetree: document Conexant Digicolor irq binding
irqchip: omap-intc: Remove unused legacy interface for omap2
irqchip: omap-intc: Fix support for dm814 and dm816
irqchip: mtk-sysirq: Get irq number from register resource size
irqchip: renesas-intc-irqpin: r8a7779 IRLM setup support
genirq: Set initial affinity in irq_set_affinity_hint()
Diffstat (limited to 'include/linux/irqchip')
| -rw-r--r-- | include/linux/irqchip/irq-omap-intc.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/irqchip/irq-omap-intc.h b/include/linux/irqchip/irq-omap-intc.h index e06b370cfc0d..2e3d1afeb674 100644 --- a/include/linux/irqchip/irq-omap-intc.h +++ b/include/linux/irqchip/irq-omap-intc.h @@ -18,9 +18,7 @@ #ifndef __INCLUDE_LINUX_IRQCHIP_IRQ_OMAP_INTC_H #define __INCLUDE_LINUX_IRQCHIP_IRQ_OMAP_INTC_H -void omap2_init_irq(void); void omap3_init_irq(void); -void ti81xx_init_irq(void); int omap_irq_pending(void); void omap_intc_save_context(void); |