Merge branch 'omap/multiplatform-fixes', tag 'v3.8-rc5' into next/multiplatform

[firefly-linux-kernel-4.4.55.git] / arch / s390 / include / asm / irq.h

diff --git a/arch/s390/include/asm/irq.h b/arch/s390/include/asm/irq.h
index c98dcac70ae0c754a8c4b9165a47ba28adc0f99b..7def77302d630995a1018cd2ffe02a05ee289e10 100644 (file)
--- a/arch/s390/include/asm/irq.h
+++ b/arch/s390/include/asm/irq.h
@@ -42,6 +42,7 @@ enum interruption_class {
        IRQIO_PCI,
        IRQIO_MSI,
        NMI_NMI,
+       CPU_RST,
        NR_ARCH_IRQS
 };