i386: move pci
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
diff --git a/arch/i386/Makefile b/arch/i386/Makefile
index da64799..87c959d 100644
--- a/arch/i386/Makefile
+++ b/arch/i386/Makefile
@@ -107,7 +107,7 @@
$(mcore-y)/ \
arch/x86/crypto/
drivers-$(CONFIG_MATH_EMULATION) += arch/x86/math-emu/
-drivers-$(CONFIG_PCI) += arch/i386/pci/
+drivers-$(CONFIG_PCI) += arch/x86/pci/
# must be linked after kernel/
drivers-$(CONFIG_OPROFILE) += arch/i386/oprofile/
drivers-$(CONFIG_PM) += arch/x86/power/
diff --git a/arch/i386/pci/Makefile b/arch/x86/pci/Makefile
similarity index 65%
rename from arch/i386/pci/Makefile
rename to arch/x86/pci/Makefile
index d04d8f9..b3e54c4 100644
--- a/arch/i386/pci/Makefile
+++ b/arch/x86/pci/Makefile
@@ -1,5 +1,5 @@
ifeq ($(CONFIG_X86_32),y)
-include ${srctree}/arch/i386/pci/Makefile_32
+include ${srctree}/arch/x86/pci/Makefile_32
else
include ${srctree}/arch/x86_64/pci/Makefile_64
endif
diff --git a/arch/i386/pci/Makefile_32 b/arch/x86/pci/Makefile_32
similarity index 100%
rename from arch/i386/pci/Makefile_32
rename to arch/x86/pci/Makefile_32
diff --git a/arch/i386/pci/acpi.c b/arch/x86/pci/acpi.c
similarity index 100%
rename from arch/i386/pci/acpi.c
rename to arch/x86/pci/acpi.c
diff --git a/arch/i386/pci/common.c b/arch/x86/pci/common.c
similarity index 100%
rename from arch/i386/pci/common.c
rename to arch/x86/pci/common.c
diff --git a/arch/i386/pci/direct.c b/arch/x86/pci/direct.c
similarity index 100%
rename from arch/i386/pci/direct.c
rename to arch/x86/pci/direct.c
diff --git a/arch/i386/pci/early.c b/arch/x86/pci/early.c
similarity index 100%
rename from arch/i386/pci/early.c
rename to arch/x86/pci/early.c
diff --git a/arch/i386/pci/fixup.c b/arch/x86/pci/fixup.c
similarity index 100%
rename from arch/i386/pci/fixup.c
rename to arch/x86/pci/fixup.c
diff --git a/arch/i386/pci/i386.c b/arch/x86/pci/i386.c
similarity index 100%
rename from arch/i386/pci/i386.c
rename to arch/x86/pci/i386.c
diff --git a/arch/i386/pci/init.c b/arch/x86/pci/init.c
similarity index 100%
rename from arch/i386/pci/init.c
rename to arch/x86/pci/init.c
diff --git a/arch/i386/pci/irq.c b/arch/x86/pci/irq.c
similarity index 100%
rename from arch/i386/pci/irq.c
rename to arch/x86/pci/irq.c
diff --git a/arch/i386/pci/legacy.c b/arch/x86/pci/legacy.c
similarity index 100%
rename from arch/i386/pci/legacy.c
rename to arch/x86/pci/legacy.c
diff --git a/arch/i386/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c
similarity index 100%
rename from arch/i386/pci/mmconfig-shared.c
rename to arch/x86/pci/mmconfig-shared.c
diff --git a/arch/i386/pci/mmconfig_32.c b/arch/x86/pci/mmconfig_32.c
similarity index 100%
rename from arch/i386/pci/mmconfig_32.c
rename to arch/x86/pci/mmconfig_32.c
diff --git a/arch/i386/pci/numa.c b/arch/x86/pci/numa.c
similarity index 100%
rename from arch/i386/pci/numa.c
rename to arch/x86/pci/numa.c
diff --git a/arch/i386/pci/pcbios.c b/arch/x86/pci/pcbios.c
similarity index 100%
rename from arch/i386/pci/pcbios.c
rename to arch/x86/pci/pcbios.c
diff --git a/arch/i386/pci/pci.h b/arch/x86/pci/pci.h
similarity index 100%
rename from arch/i386/pci/pci.h
rename to arch/x86/pci/pci.h
diff --git a/arch/i386/pci/visws.c b/arch/x86/pci/visws.c
similarity index 100%
rename from arch/i386/pci/visws.c
rename to arch/x86/pci/visws.c
diff --git a/arch/x86_64/pci/Makefile b/arch/x86_64/pci/Makefile
index d04d8f9..b3e54c4 100644
--- a/arch/x86_64/pci/Makefile
+++ b/arch/x86_64/pci/Makefile
@@ -1,5 +1,5 @@
ifeq ($(CONFIG_X86_32),y)
-include ${srctree}/arch/i386/pci/Makefile_32
+include ${srctree}/arch/x86/pci/Makefile_32
else
include ${srctree}/arch/x86_64/pci/Makefile_64
endif
diff --git a/arch/x86_64/pci/Makefile_64 b/arch/x86_64/pci/Makefile_64
index 77b1b9a..79b618b 100644
--- a/arch/x86_64/pci/Makefile_64
+++ b/arch/x86_64/pci/Makefile_64
@@ -3,7 +3,7 @@
#
# Reuse the i386 PCI subsystem
#
-EXTRA_CFLAGS += -Iarch/i386/pci
+EXTRA_CFLAGS += -Iarch/x86/pci
obj-y := i386.o
obj-$(CONFIG_PCI_DIRECT)+= direct.o
@@ -15,13 +15,13 @@
obj-$(CONFIG_NUMA) += k8-bus_64.o
-direct-y += ../../i386/pci/direct.o
-acpi-y += ../../i386/pci/acpi.o
-legacy-y += ../../i386/pci/legacy.o
-irq-y += ../../i386/pci/irq.o
-common-y += ../../i386/pci/common.o
-fixup-y += ../../i386/pci/fixup.o
-i386-y += ../../i386/pci/i386.o
-init-y += ../../i386/pci/init.o
-early-y += ../../i386/pci/early.o
-mmconfig-shared-y += ../../i386/pci/mmconfig-shared.o
+direct-y += ../../x86/pci/direct.o
+acpi-y += ../../x86/pci/acpi.o
+legacy-y += ../../x86/pci/legacy.o
+irq-y += ../../x86/pci/irq.o
+common-y += ../../x86/pci/common.o
+fixup-y += ../../x86/pci/fixup.o
+i386-y += ../../x86/pci/i386.o
+init-y += ../../x86/pci/init.o
+early-y += ../../x86/pci/early.o
+mmconfig-shared-y += ../../x86/pci/mmconfig-shared.o
diff --git a/drivers/pci/hotplug/cpqphp_core.c b/drivers/pci/hotplug/cpqphp_core.c
index d590a99..2305cc4 100644
--- a/drivers/pci/hotplug/cpqphp_core.c
+++ b/drivers/pci/hotplug/cpqphp_core.c
@@ -45,7 +45,7 @@
#include "cpqphp.h"
#include "cpqphp_nvram.h"
-#include "../../../arch/i386/pci/pci.h" /* horrible hack showing how processor dependent we are... */
+#include "../../../arch/x86/pci/pci.h" /* horrible hack showing how processor dependent we are... */
/* Global variables */
diff --git a/drivers/pci/hotplug/cpqphp_pci.c b/drivers/pci/hotplug/cpqphp_pci.c
index fc7c74d..3f6cd20 100644
--- a/drivers/pci/hotplug/cpqphp_pci.c
+++ b/drivers/pci/hotplug/cpqphp_pci.c
@@ -37,7 +37,7 @@
#include "../pci.h"
#include "cpqphp.h"
#include "cpqphp_nvram.h"
-#include "../../../arch/i386/pci/pci.h" /* horrible hack showing how processor dependent we are... */
+#include "../../../arch/x86/pci/pci.h" /* horrible hack showing how processor dependent we are... */
u8 cpqhp_nic_irq;
diff --git a/drivers/pci/hotplug/ibmphp_core.c b/drivers/pci/hotplug/ibmphp_core.c
index 0316eea..a90c28d 100644
--- a/drivers/pci/hotplug/ibmphp_core.c
+++ b/drivers/pci/hotplug/ibmphp_core.c
@@ -35,7 +35,7 @@
#include <linux/delay.h>
#include <linux/wait.h>
#include "../pci.h"
-#include "../../../arch/i386/pci/pci.h" /* for struct irq_routing_table */
+#include "../../../arch/x86/pci/pci.h" /* for struct irq_routing_table */
#include "ibmphp.h"
#define attn_on(sl) ibmphp_hpc_writeslot (sl, HPC_SLOT_ATTNON)
