i386: move pci

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

23 files changed, 17 insertions, 17 deletions

diff --git a/arch/i386/Makefile b/arch/i386/Makefile
index da64799484a7..87c959d5f354 100644
--- a/arch/i386/Makefile
+++ b/arch/i386/Makefile
@@ -107,7 +107,7 @@ core-y					+= arch/i386/kernel/ \
                                            $(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
index d04d8f976d1c..b3e54c45d408 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
index cdd6828b5abb..cdd6828b5abb 100644
--- a/arch/i386/pci/Makefile_32
+++ b/arch/x86/pci/Makefile_32
diff --git a/arch/i386/pci/acpi.c b/arch/x86/pci/acpi.c
index bc8a44bddaa7..bc8a44bddaa7 100644
--- a/arch/i386/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
diff --git a/arch/i386/pci/common.c b/arch/x86/pci/common.c
index ebc6f3c66340..ebc6f3c66340 100644
--- a/arch/i386/pci/common.c
+++ b/arch/x86/pci/common.c
diff --git a/arch/i386/pci/direct.c b/arch/x86/pci/direct.c
index 431c9a51b157..431c9a51b157 100644
--- a/arch/i386/pci/direct.c
+++ b/arch/x86/pci/direct.c
diff --git a/arch/i386/pci/early.c b/arch/x86/pci/early.c
index 42df4b6606df..42df4b6606df 100644
--- a/arch/i386/pci/early.c
+++ b/arch/x86/pci/early.c
diff --git a/arch/i386/pci/fixup.c b/arch/x86/pci/fixup.c
index c82cbf4c7226..c82cbf4c7226 100644
--- a/arch/i386/pci/fixup.c
+++ b/arch/x86/pci/fixup.c
diff --git a/arch/i386/pci/i386.c b/arch/x86/pci/i386.c
index bcd2f94b732c..bcd2f94b732c 100644
--- a/arch/i386/pci/i386.c
+++ b/arch/x86/pci/i386.c
diff --git a/arch/i386/pci/init.c b/arch/x86/pci/init.c
index 3de9f9ba2da6..3de9f9ba2da6 100644
--- a/arch/i386/pci/init.c
+++ b/arch/x86/pci/init.c
diff --git a/arch/i386/pci/irq.c b/arch/x86/pci/irq.c
index 8434f2323b87..8434f2323b87 100644
--- a/arch/i386/pci/irq.c
+++ b/arch/x86/pci/irq.c
diff --git a/arch/i386/pci/legacy.c b/arch/x86/pci/legacy.c
index 5565d7016b75..5565d7016b75 100644
--- a/arch/i386/pci/legacy.c
+++ b/arch/x86/pci/legacy.c
diff --git a/arch/i386/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c
index 4df637e34f81..4df637e34f81 100644
--- a/arch/i386/pci/mmconfig-shared.c
+++ b/arch/x86/pci/mmconfig-shared.c
diff --git a/arch/i386/pci/mmconfig_32.c b/arch/x86/pci/mmconfig_32.c
index 1bf5816d34c8..1bf5816d34c8 100644
--- a/arch/i386/pci/mmconfig_32.c
+++ b/arch/x86/pci/mmconfig_32.c
diff --git a/arch/i386/pci/numa.c b/arch/x86/pci/numa.c
index f5f165f69e0c..f5f165f69e0c 100644
--- a/arch/i386/pci/numa.c
+++ b/arch/x86/pci/numa.c
diff --git a/arch/i386/pci/pcbios.c b/arch/x86/pci/pcbios.c
index 10ac8c316c46..10ac8c316c46 100644
--- a/arch/i386/pci/pcbios.c
+++ b/arch/x86/pci/pcbios.c
diff --git a/arch/i386/pci/pci.h b/arch/x86/pci/pci.h
index 8c66f275756f..8c66f275756f 100644
--- a/arch/i386/pci/pci.h
+++ b/arch/x86/pci/pci.h
diff --git a/arch/i386/pci/visws.c b/arch/x86/pci/visws.c
index 8ecb1c722594..8ecb1c722594 100644
--- a/arch/i386/pci/visws.c
+++ b/arch/x86/pci/visws.c
diff --git a/arch/x86_64/pci/Makefile b/arch/x86_64/pci/Makefile
index d04d8f976d1c..b3e54c45d408 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 77b1b9abedc2..79b618b9e9d4 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_PCI_MMCONFIG) += mmconfig_64.o direct.o mmconfig-shared.o
 
 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 d590a99930fa..2305cc450a45 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 fc7c74d72595..3f6cd20e95d2 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 0316eeaaeb29..a90c28d0c69d 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)