x86_64: move pci

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

diff --git a/arch/x86/pci/Makefile b/arch/x86/pci/Makefile
index b3e54c4..c5c8e48 100644 (file)
--- a/arch/x86/pci/Makefile
+++ b/arch/x86/pci/Makefile
@@ -1,5 +1,5 @@
 ifeq ($(CONFIG_X86_32),y)
 include ${srctree}/arch/x86/pci/Makefile_32
 else
-include ${srctree}/arch/x86_64/pci/Makefile_64
+include ${srctree}/arch/x86/pci/Makefile_64
 endif

diff --git a/arch/x86_64/pci/Makefile_64 b/arch/x86/pci/Makefile_64
similarity index 53%
rename from arch/x86_64/pci/Makefile_64
rename to arch/x86/pci/Makefile_64
index 79b618b..7d8c467 100644 (file)
--- a/arch/x86_64/pci/Makefile_64
+++ b/arch/x86/pci/Makefile_64
@@ -15,13 +15,3 @@ obj-$(CONFIG_PCI_MMCONFIG) += mmconfig_64.o direct.o mmconfig-shared.o
 
 obj-$(CONFIG_NUMA)     += k8-bus_64.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/arch/x86_64/pci/k8-bus_64.c b/arch/x86/pci/k8-bus_64.c
similarity index 100%
rename from arch/x86_64/pci/k8-bus_64.c
rename to arch/x86/pci/k8-bus_64.c

diff --git a/arch/x86_64/pci/mmconfig_64.c b/arch/x86/pci/mmconfig_64.c
similarity index 100%
rename from arch/x86_64/pci/mmconfig_64.c
rename to arch/x86/pci/mmconfig_64.c

diff --git a/arch/x86_64/Makefile b/arch/x86_64/Makefile
index d322592..c10c823 100644 (file)
--- a/arch/x86_64/Makefile
+++ b/arch/x86_64/Makefile
@@ -79,7 +79,7 @@ core-y                                        += arch/x86_64/kernel/ \
                                           arch/x86/crypto/ \
                                           arch/x86/vdso/
 core-$(CONFIG_IA32_EMULATION)          += arch/x86_64/ia32/
-drivers-$(CONFIG_PCI)                  += arch/x86_64/pci/
+drivers-$(CONFIG_PCI)                  += arch/x86/pci/
 drivers-$(CONFIG_OPROFILE)             += arch/x86/oprofile/
 
 boot := arch/x86_64/boot

diff --git a/arch/x86_64/pci/Makefile b/arch/x86_64/pci/Makefile
deleted file mode 100644 (file)
index b3e54c4..0000000
--- a/arch/x86_64/pci/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-ifeq ($(CONFIG_X86_32),y)
-include ${srctree}/arch/x86/pci/Makefile_32
-else
-include ${srctree}/arch/x86_64/pci/Makefile_64
-endif