Merge tag 'v3.15-rc1' into perf/urgent

[karo-tx-linux.git] / drivers / irqchip / irq-orion.c

diff --git a/drivers/irqchip/irq-orion.c b/drivers/irqchip/irq-orion.c
index 8e41be62812e1663df05b58f75c52ecfdc7b844f..e25f246cd2fb9a75d90ab57a4d1d1e12feb494f1 100644 (file)
--- a/drivers/irqchip/irq-orion.c
+++ b/drivers/irqchip/irq-orion.c
@@ -30,7 +30,7 @@
 
 static struct irq_domain *orion_irq_domain;
 
-static asmlinkage void
+static void
 __exception_irq_entry orion_handle_irq(struct pt_regs *regs)
 {
        struct irq_domain_chip_generic *dgc = orion_irq_domain->gc;