aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86_64
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2007-10-11 11:16:36 +0200
committerThomas Gleixner <tglx@linutronix.de>2007-10-11 11:16:36 +0200
commitfb9aa6f1d4a1e11e66a680460b2c2b2b10b62f79 (patch)
treee0ad51f39b48a342244cef62099bd1a8a93927db /arch/x86_64
parenti386: move power (diff)
downloadlinux-dev-fb9aa6f1d4a1e11e66a680460b2c2b2b10b62f79.tar.xz
linux-dev-fb9aa6f1d4a1e11e66a680460b2c2b2b10b62f79.zip
i386: move pci
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86_64')
-rw-r--r--arch/x86_64/pci/Makefile2
-rw-r--r--arch/x86_64/pci/Makefile_6422
2 files changed, 12 insertions, 12 deletions
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