Merge branch 'topic/asoc' into for-linus

[firefly-linux-kernel-4.4.55.git] / arch / x86 / include / asm / i8259.h

diff --git a/arch/x86/include/asm/i8259.h b/arch/x86/include/asm/i8259.h
index 23c1b3baaecd09284a9ff06b5f0375f8d1cf2e86..58d7091eeb1fc1e8955c87246121060fbb851d31 100644 (file)
--- a/arch/x86/include/asm/i8259.h
+++ b/arch/x86/include/asm/i8259.h
@@ -1,5 +1,5 @@
-#ifndef ASM_X86__I8259_H
-#define ASM_X86__I8259_H
+#ifndef _ASM_X86_I8259_H
+#define _ASM_X86_I8259_H
 
 #include <linux/delay.h>
 
@@ -60,4 +60,4 @@ extern struct irq_chip i8259A_chip;
 extern void mask_8259A(void);
 extern void unmask_8259A(void);
 
-#endif /* ASM_X86__I8259_H */
+#endif /* _ASM_X86_I8259_H */