Merge branch 'linus' into perfcounters/core-v2

[linux-drm-fsl-dcu.git] / arch / powerpc / include / asm / hw_irq.h

diff --git a/arch/powerpc/include/asm/hw_irq.h b/arch/powerpc/include/asm/hw_irq.h
index e10f151c3db647b3e4f0c76835dba8879c942707..b43076ff92c9b82baa7a3bfbe35a7e9cbd5c21c1 100644 (file)
--- a/arch/powerpc/include/asm/hw_irq.h
+++ b/arch/powerpc/include/asm/hw_irq.h
@@ -129,7 +129,7 @@ static inline int irqs_disabled_flags(unsigned long flags)
  * interrupt-retrigger: should we handle this via lost interrupts and IPIs
  * or should we not care like we do now ? --BenH.
  */
-struct hw_interrupt_type;
+struct irq_chip;
 
 #ifdef CONFIG_PERF_COUNTERS
 static inline unsigned long get_perf_counter_pending(void)