Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[karo-tx-linux.git] / include / linux / irq.h

diff --git a/include/linux/irq.h b/include/linux/irq.h
index e21ed837c67353e594068c6015a0e0f4ab9628d3..fdf2c4a238cc605390b63bcdefb1f41533ae426b 100644 (file)
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -389,6 +389,15 @@ static inline void irq_move_masked_irq(struct irq_data *data) { }
 
 extern int no_irq_affinity;
 
+#ifdef CONFIG_HARDIRQS_SW_RESEND
+int irq_set_parent(int irq, int parent_irq);
+#else
+static inline int irq_set_parent(int irq, int parent_irq)
+{
+       return 0;
+}
+#endif
+
 /*
  * Built-in IRQ handlers for various IRQ types,
  * callable via desc->handle_irq()