Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder...

[firefly-linux-kernel-4.4.55.git] / arch / x86 / kernel / i8259.c

diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c
index 4b8a53d841f7a1c71e75eb85a9fe4ecacb17d4b3..df89102bef809908536b0449e73e434458f5fabc 100644 (file)
--- a/arch/x86/kernel/i8259.c
+++ b/arch/x86/kernel/i8259.c
@@ -11,18 +11,17 @@
 #include <linux/kernel_stat.h>
 #include <linux/sysdev.h>
 #include <linux/bitops.h>
+#include <linux/acpi.h>
+#include <linux/io.h>
+#include <linux/delay.h>
 
-#include <asm/acpi.h>
 #include <asm/atomic.h>
 #include <asm/system.h>
-#include <asm/io.h>
 #include <asm/timer.h>
 #include <asm/hw_irq.h>
 #include <asm/pgtable.h>
-#include <asm/delay.h>
 #include <asm/desc.h>
 #include <asm/apic.h>
-#include <asm/arch_hooks.h>
 #include <asm/i8259.h>
 
 /*
@@ -323,7 +322,7 @@ void init_8259A(int auto_eoi)
        outb_pic(0x11, PIC_MASTER_CMD); /* ICW1: select 8259A-1 init */
 
        /* ICW2: 8259A-1 IR0-7 mapped to 0x30-0x37 on x86-64,
-                              to 0x20-0x27 on i386 */
+          to 0x20-0x27 on i386 */
        outb_pic(IRQ0_VECTOR, PIC_MASTER_IMR);
 
        /* 8259A-1 (the master) has a slave on IR2 */