diff --git a/[refs] b/[refs] index 5250265640ac..ee5b7a62e981 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6829310548a76d343205029bb41c14e75bf6a7fb +refs/heads/master: 33b054b867b84015173a38d9cd9ff513b6498818 diff --git a/trunk/include/linux/irq.h b/trunk/include/linux/irq.h index 44ebca745789..41fc783171fd 100644 --- a/trunk/include/linux/irq.h +++ b/trunk/include/linux/irq.h @@ -413,9 +413,6 @@ static inline void irq_move_masked_irq(struct irq_data *data) { } extern int no_irq_affinity; -/* Handle irq action chains: */ -extern irqreturn_t handle_IRQ_event(unsigned int irq, struct irqaction *action); - /* * Built-in IRQ handlers for various IRQ types, * callable via desc->handle_irq() diff --git a/trunk/kernel/irq/handle.c b/trunk/kernel/irq/handle.c index 60fd5cd75c77..1a2fb77f2fd6 100644 --- a/trunk/kernel/irq/handle.c +++ b/trunk/kernel/irq/handle.c @@ -188,15 +188,3 @@ irqreturn_t handle_irq_event(struct irq_desc *desc) irq_compat_clr_progress(desc); return ret; } - -/** - * handle_IRQ_event - irq action chain handler - * @irq: the interrupt number - * @action: the interrupt action chain for this irq - * - * Handles the action chain of an irq event - */ -irqreturn_t handle_IRQ_event(unsigned int irq, struct irqaction *action) -{ - return handle_irq_event_percpu(irq_to_desc(irq), action); -}