aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2007-10-11 11:17:12 +0200
committerThomas Gleixner <tglx@linutronix.de>2007-10-11 11:17:12 +0200
commitf68c065491ceda1ad00f8dc493e274a79b8c2ba4 (patch)
treecff56e1483deb0f96d3a001845e8db3f0f2d6b0b /arch
parent7648b1330c335601b7c09c25f77a03cda128fcab (diff)
x86_64: move pci
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/pci/Makefile2
-rw-r--r--arch/x86/pci/Makefile_64 (renamed from arch/x86_64/pci/Makefile_64)10
-rw-r--r--arch/x86/pci/k8-bus_64.c (renamed from arch/x86_64/pci/k8-bus_64.c)0
-rw-r--r--arch/x86/pci/mmconfig_64.c (renamed from arch/x86_64/pci/mmconfig_64.c)0
-rw-r--r--arch/x86_64/Makefile2
-rw-r--r--arch/x86_64/pci/Makefile5
6 files changed, 2 insertions, 17 deletions
diff --git a/arch/x86/pci/Makefile b/arch/x86/pci/Makefile
index b3e54c45d40..c5c8e485fc4 100644
--- 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
index 79b618b9e9d..7d8c467bf14 100644
--- 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
index 9cc813e2970..9cc813e2970 100644
--- a/arch/x86_64/pci/k8-bus_64.c
+++ b/arch/x86/pci/k8-bus_64.c
diff --git a/arch/x86_64/pci/mmconfig_64.c b/arch/x86/pci/mmconfig_64.c
index 4095e4d66a1..4095e4d66a1 100644
--- a/arch/x86_64/pci/mmconfig_64.c
+++ b/arch/x86/pci/mmconfig_64.c
diff --git a/arch/x86_64/Makefile b/arch/x86_64/Makefile
index d322592e38a..c10c8233a89 100644
--- 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
index b3e54c45d40..00000000000
--- 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