aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/mach-visws/visws_apic.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-08 09:53:57 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-08 09:53:57 +0200
commit1b8ba39a3fad9c58532f6dad12c94d6e675be656 (patch)
tree9ae9b4c4545b4c91f5dbb3a1085c4c721961c4f2 /arch/x86/mach-visws/visws_apic.c
parent58cf35228fec541418cc3bd781d6c069d904815e (diff)
parentcbd6712406a3ea861b49fbfd46e23cbf5f8e073f (diff)
Merge branch 'x86/irq' into x86/devel
Conflicts: arch/x86/kernel/i8259.c arch/x86/kernel/irqinit_64.c Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/mach-visws/visws_apic.c')
-rw-r--r--arch/x86/mach-visws/visws_apic.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/mach-visws/visws_apic.c b/arch/x86/mach-visws/visws_apic.c
index cef9cb1d15a..d8b2cfd85d9 100644
--- a/arch/x86/mach-visws/visws_apic.c
+++ b/arch/x86/mach-visws/visws_apic.c
@@ -21,10 +21,9 @@
#include <asm/io.h>
#include <asm/apic.h>
#include <asm/i8259.h>
+#include <asm/irq_vectors.h>
#include "cobalt.h"
-#include "irq_vectors.h"
-
static DEFINE_SPINLOCK(cobalt_lock);