x86_64: move pci
Thomas Gleixner [Thu, 11 Oct 2007 09:17:12 +0000 (11:17 +0200)]
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

arch/x86/pci/Makefile
arch/x86/pci/Makefile_64 [new file with mode: 0644]
arch/x86/pci/k8-bus_64.c [moved from arch/x86_64/pci/k8-bus_64.c with 100% similarity]
arch/x86/pci/mmconfig_64.c [moved from arch/x86_64/pci/mmconfig_64.c with 100% similarity]
arch/x86_64/Makefile
arch/x86_64/pci/Makefile [deleted file]
arch/x86_64/pci/Makefile_64 [deleted file]

index b3e54c4..c5c8e48 100644 (file)
@@ -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/pci/Makefile_64 b/arch/x86/pci/Makefile_64
new file mode 100644 (file)
index 0000000..7d8c467
--- /dev/null
@@ -0,0 +1,17 @@
+#
+# Makefile for X86_64 specific PCI routines
+#
+# Reuse the i386 PCI subsystem
+#
+EXTRA_CFLAGS += -Iarch/x86/pci
+
+obj-y          := i386.o
+obj-$(CONFIG_PCI_DIRECT)+= direct.o
+obj-y          += fixup.o init.o
+obj-$(CONFIG_ACPI)     += acpi.o
+obj-y                  += legacy.o irq.o common.o early.o
+# mmconfig has a 64bit special
+obj-$(CONFIG_PCI_MMCONFIG) += mmconfig_64.o direct.o mmconfig-shared.o
+
+obj-$(CONFIG_NUMA)     += k8-bus_64.o
+
index d322592..c10c823 100644 (file)
@@ -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
+++ /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
diff --git a/arch/x86_64/pci/Makefile_64 b/arch/x86_64/pci/Makefile_64
deleted file mode 100644 (file)
index 79b618b..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Makefile for X86_64 specific PCI routines
-#
-# Reuse the i386 PCI subsystem
-#
-EXTRA_CFLAGS += -Iarch/x86/pci
-
-obj-y          := i386.o
-obj-$(CONFIG_PCI_DIRECT)+= direct.o
-obj-y          += fixup.o init.o
-obj-$(CONFIG_ACPI)     += acpi.o
-obj-y                  += legacy.o irq.o common.o early.o
-# mmconfig has a 64bit special
-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