aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/pci
diff options
context:
space:
mode:
authorRobert Richter <robert.richter@amd.com>2008-07-02 16:50:24 -0400
committerIngo Molnar <mingo@elte.hu>2008-07-09 05:44:28 -0400
commit8eefc6640311bb56408fa0abe3f2930b3037f91a (patch)
treebd019fea2d845f1fc6067dac3d6666c3c46fc52a /arch/x86/pci
parent8043c7be4b8dabaaeed8344dd0a4cbaa9a94fb71 (diff)
x86/pci: Makefile merge: creating pci-y for 64 bit
Signed-off-by: Robert Richter <robert.richter@amd.com> Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/pci')
-rw-r--r--arch/x86/pci/Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/pci/Makefile b/arch/x86/pci/Makefile
index d5f15eff2be0..ed130a2ef671 100644
--- a/arch/x86/pci/Makefile
+++ b/arch/x86/pci/Makefile
@@ -34,10 +34,10 @@ else
34obj-y := i386.o init.o 34obj-y := i386.o init.o
35obj-$(CONFIG_PCI_MMCONFIG) += mmconfig_64.o direct.o mmconfig-shared.o 35obj-$(CONFIG_PCI_MMCONFIG) += mmconfig_64.o direct.o mmconfig-shared.o
36obj-$(CONFIG_PCI_DIRECT) += direct.o 36obj-$(CONFIG_PCI_DIRECT) += direct.o
37obj-y += fixup.o 37pci-y := fixup.o
38obj-$(CONFIG_ACPI) += acpi.o 38pci-$(CONFIG_ACPI) += acpi.o
39obj-y += legacy.o irq.o 39pci-y += legacy.o irq.o
40obj-y += common.o early.o 40obj-y += $(pci-y) common.o early.o
41obj-y += amd_bus.o 41obj-y += amd_bus.o
42 42
43endif 43endif