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

[firefly-linux-kernel-4.4.55.git] / include / linux / nmi.h

diff --git a/include/linux/nmi.h b/include/linux/nmi.h
index 447775ee2c4b0e51429af5c8e06276ac8a19c65d..1d2a6ab6b8bbae61a679df9f46f1d97012831235 100644 (file)
--- a/include/linux/nmi.h
+++ b/include/linux/nmi.h
@@ -63,4 +63,8 @@ extern int proc_dowatchdog(struct ctl_table *, int ,
                           void __user *, size_t *, loff_t *);
 #endif
 
+#ifdef CONFIG_HAVE_ACPI_APEI_NMI
+#include <asm/nmi.h>
+#endif
+
 #endif