aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-10 15:25:21 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-10 18:55:39 +0200
commitb4b86416712d79a77cdc53756751b3b91fbb7a3d (patch)
treedb298dbbf07dc8b05f3d2024c8b3e2393c9a567e
parent18c413e27e1585358cedc22e450847e3240006ff (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.c4
-rw-r--r--arch/x86/mach-visws/traps.c6
-rw-r--r--arch/x86/mach-visws/visws_apic.c3
-rw-r--r--arch/x86/pci/visws.c4
-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 bbc149f78a4..e95e9499c8c 100644
--- a/arch/x86/mach-visws/setup_visws.c
+++ b/arch/x86/mach-visws/setup_visws.c
@@ -8,6 +8,8 @@
#include <linux/init.h>
#include <linux/smp.h>
+#include <asm/visws/cobalt.h>
+#include <asm/visws/piix4.h>
#include <asm/arch_hooks.h>
#include <asm/fixmap.h>
#include <asm/reboot.h>
@@ -18,8 +20,6 @@
#include <mach_ipi.h>
-#include "cobalt.h"
-#include "piix4.h"
#include "mach_apic.h"
#include <linux/init.h>
diff --git a/arch/x86/mach-visws/traps.c b/arch/x86/mach-visws/traps.c
index 8a160ec147f..e5e6492c267 100644
--- a/arch/x86/mach-visws/traps.c
+++ b/arch/x86/mach-visws/traps.c
@@ -7,10 +7,10 @@
#include <linux/pci_ids.h>
#include <asm/io.h>
-#include <asm/arch_hooks.h>
#include <asm/apic.h>
-#include "cobalt.h"
-#include "lithium.h"
+#include <asm/arch_hooks.h>
+#include <asm/visws/cobalt.h>
+#include <asm/visws/lithium.h>
#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 d8b2cfd85d9..6c02c8d0993 100644
--- a/arch/x86/mach-visws/visws_apic.c
+++ b/arch/x86/mach-visws/visws_apic.c
@@ -22,8 +22,7 @@
#include <asm/apic.h>
#include <asm/i8259.h>
#include <asm/irq_vectors.h>
-
-#include "cobalt.h"
+#include <asm/visws/cobalt.h>
static DEFINE_SPINLOCK(cobalt_lock);
diff --git a/arch/x86/pci/visws.c b/arch/x86/pci/visws.c
index 9b883890c0b..1a7bed492bb 100644
--- a/arch/x86/pci/visws.c
+++ b/arch/x86/pci/visws.c
@@ -9,8 +9,8 @@
#include <linux/init.h>
#include <asm/setup.h>
-#include "cobalt.h"
-#include "lithium.h"
+#include <asm/visws/cobalt.h>
+#include <asm/visws/lithium.h>
#include "pci.h"
diff --git a/include/asm-x86/mach-visws/cobalt.h b/include/asm-x86/visws/cobalt.h
index 995258831b7..995258831b7 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 dfcd4f07ab8..dfcd4f07ab8 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 83ea4f46e41..83ea4f46e41 100644
--- a/include/asm-x86/mach-visws/piix4.h
+++ b/include/asm-x86/visws/piix4.h