diff options
Diffstat (limited to 'arch/x86/mach-visws')
-rw-r--r-- | arch/x86/mach-visws/setup_visws.c | 4 | ||||
-rw-r--r-- | arch/x86/mach-visws/traps.c | 6 | ||||
-rw-r--r-- | arch/x86/mach-visws/visws_apic.c | 3 |
3 files changed, 6 insertions, 7 deletions
diff --git a/arch/x86/mach-visws/setup_visws.c b/arch/x86/mach-visws/setup_visws.c index bbc149f78a4b..e95e9499c8cd 100644 --- a/arch/x86/mach-visws/setup_visws.c +++ b/arch/x86/mach-visws/setup_visws.c | |||
@@ -8,6 +8,8 @@ | |||
8 | #include <linux/init.h> | 8 | #include <linux/init.h> |
9 | #include <linux/smp.h> | 9 | #include <linux/smp.h> |
10 | 10 | ||
11 | #include <asm/visws/cobalt.h> | ||
12 | #include <asm/visws/piix4.h> | ||
11 | #include <asm/arch_hooks.h> | 13 | #include <asm/arch_hooks.h> |
12 | #include <asm/fixmap.h> | 14 | #include <asm/fixmap.h> |
13 | #include <asm/reboot.h> | 15 | #include <asm/reboot.h> |
@@ -18,8 +20,6 @@ | |||
18 | 20 | ||
19 | #include <mach_ipi.h> | 21 | #include <mach_ipi.h> |
20 | 22 | ||
21 | #include "cobalt.h" | ||
22 | #include "piix4.h" | ||
23 | #include "mach_apic.h" | 23 | #include "mach_apic.h" |
24 | 24 | ||
25 | #include <linux/init.h> | 25 | #include <linux/init.h> |
diff --git a/arch/x86/mach-visws/traps.c b/arch/x86/mach-visws/traps.c index 8a160ec147f7..e5e6492c2676 100644 --- a/arch/x86/mach-visws/traps.c +++ b/arch/x86/mach-visws/traps.c | |||
@@ -7,10 +7,10 @@ | |||
7 | #include <linux/pci_ids.h> | 7 | #include <linux/pci_ids.h> |
8 | 8 | ||
9 | #include <asm/io.h> | 9 | #include <asm/io.h> |
10 | #include <asm/arch_hooks.h> | ||
11 | #include <asm/apic.h> | 10 | #include <asm/apic.h> |
12 | #include "cobalt.h" | 11 | #include <asm/arch_hooks.h> |
13 | #include "lithium.h" | 12 | #include <asm/visws/cobalt.h> |
13 | #include <asm/visws/lithium.h> | ||
14 | 14 | ||
15 | 15 | ||
16 | #define A01234 (LI_INTA_0 | LI_INTA_1 | LI_INTA_2 | LI_INTA_3 | LI_INTA_4) | 16 | #define A01234 (LI_INTA_0 | LI_INTA_1 | LI_INTA_2 | LI_INTA_3 | LI_INTA_4) |
diff --git a/arch/x86/mach-visws/visws_apic.c b/arch/x86/mach-visws/visws_apic.c index d8b2cfd85d92..6c02c8d09932 100644 --- a/arch/x86/mach-visws/visws_apic.c +++ b/arch/x86/mach-visws/visws_apic.c | |||
@@ -22,8 +22,7 @@ | |||
22 | #include <asm/apic.h> | 22 | #include <asm/apic.h> |
23 | #include <asm/i8259.h> | 23 | #include <asm/i8259.h> |
24 | #include <asm/irq_vectors.h> | 24 | #include <asm/irq_vectors.h> |
25 | 25 | #include <asm/visws/cobalt.h> | |
26 | #include "cobalt.h" | ||
27 | 26 | ||
28 | static DEFINE_SPINLOCK(cobalt_lock); | 27 | static DEFINE_SPINLOCK(cobalt_lock); |
29 | 28 | ||