---

yaml --- r: 65575 b: refs/heads/master c: f68c065 h: refs/heads/master i: 65573: c241c5f 65571: a102de9 65567: adc7975 v: v3
git-mirror · Oct 11, 2007 · b01652a · b01652a
1 parent 9a68a2c
commit b01652a
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 18 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7648b1330c335601b7c09c25f77a03cda128fcab
+refs/heads/master: f68c065491ceda1ad00f8dc493e274a79b8c2ba4
diff --git a/trunk/arch/x86/pci/Makefile b/trunk/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/trunk/arch/x86_64/pci/Makefile_64 → trunk/arch/x86/pci/Makefile_64 b/trunk/arch/x86_64/pci/Makefile_64 → trunk/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/trunk/arch/x86_64/pci/k8-bus_64.c → trunk/arch/x86/pci/k8-bus_64.c b/trunk/arch/x86_64/pci/k8-bus_64.c → trunk/arch/x86/pci/k8-bus_64.c
diff --git a/trunk/arch/x86_64/pci/mmconfig_64.c → trunk/arch/x86/pci/mmconfig_64.c b/trunk/arch/x86_64/pci/mmconfig_64.c → trunk/arch/x86/pci/mmconfig_64.c
diff --git a/trunk/arch/x86_64/Makefile b/trunk/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/trunk/arch/x86_64/pci/Makefile b/trunk/arch/x86_64/pci/Makefile