diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-10 09:25:21 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-10 12:55:39 -0400 |
commit | b4b86416712d79a77cdc53756751b3b91fbb7a3d (patch) | |
tree | db298dbbf07dc8b05f3d2024c8b3e2393c9a567e | |
parent | 18c413e27e1585358cedc22e450847e3240006ff (diff) |
x86, VisWS: turn into generic arch, create include/asm-x86/visws/
move the include/asm-x86/mach-visws/ VISWS specific hardware
details include files into include/asm-x86/visws, to be used from
generic code.
No code changed.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
-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 | ||||
-rw-r--r-- | arch/x86/pci/visws.c | 4 | ||||
-rw-r--r-- | include/asm-x86/visws/cobalt.h (renamed from include/asm-x86/mach-visws/cobalt.h) | 0 | ||||
-rw-r--r-- | include/asm-x86/visws/lithium.h (renamed from include/asm-x86/mach-visws/lithium.h) | 0 | ||||
-rw-r--r-- | include/asm-x86/visws/piix4.h (renamed from include/asm-x86/mach-visws/piix4.h) | 0 |
7 files changed, 8 insertions, 9 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 | ||
diff --git a/arch/x86/pci/visws.c b/arch/x86/pci/visws.c index 9b883890c0b2..1a7bed492bb1 100644 --- a/arch/x86/pci/visws.c +++ b/arch/x86/pci/visws.c | |||
@@ -9,8 +9,8 @@ | |||
9 | #include <linux/init.h> | 9 | #include <linux/init.h> |
10 | 10 | ||
11 | #include <asm/setup.h> | 11 | #include <asm/setup.h> |
12 | #include "cobalt.h" | 12 | #include <asm/visws/cobalt.h> |
13 | #include "lithium.h" | 13 | #include <asm/visws/lithium.h> |
14 | 14 | ||
15 | #include "pci.h" | 15 | #include "pci.h" |
16 | 16 | ||
diff --git a/include/asm-x86/mach-visws/cobalt.h b/include/asm-x86/visws/cobalt.h index 995258831b7f..995258831b7f 100644 --- a/include/asm-x86/mach-visws/cobalt.h +++ b/include/asm-x86/visws/cobalt.h | |||
diff --git a/include/asm-x86/mach-visws/lithium.h b/include/asm-x86/visws/lithium.h index dfcd4f07ab85..dfcd4f07ab85 100644 --- a/include/asm-x86/mach-visws/lithium.h +++ b/include/asm-x86/visws/lithium.h | |||
diff --git a/include/asm-x86/mach-visws/piix4.h b/include/asm-x86/visws/piix4.h index 83ea4f46e419..83ea4f46e419 100644 --- a/include/asm-x86/mach-visws/piix4.h +++ b/include/asm-x86/visws/piix4.h | |||