From: Robert Richter Date: Wed, 2 Jul 2008 20:50:24 +0000 (+0200) Subject: x86/pci: Makefile merge: creating pci-y for 64 bit X-Git-Tag: v2.6.27-rc1~1106^2~32^2~5 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8eefc6640311bb56408fa0abe3f2930b3037f91a;p=linux-2.6 x86/pci: Makefile merge: creating pci-y for 64 bit Signed-off-by: Robert Richter Acked-by: Jesse Barnes Signed-off-by: Ingo Molnar --- diff --git a/arch/x86/pci/Makefile b/arch/x86/pci/Makefile index d5f15eff2b..ed130a2ef6 100644 --- a/arch/x86/pci/Makefile +++ b/arch/x86/pci/Makefile @@ -34,10 +34,10 @@ else obj-y := i386.o init.o obj-$(CONFIG_PCI_MMCONFIG) += mmconfig_64.o direct.o mmconfig-shared.o obj-$(CONFIG_PCI_DIRECT) += direct.o -obj-y += fixup.o -obj-$(CONFIG_ACPI) += acpi.o -obj-y += legacy.o irq.o -obj-y += common.o early.o +pci-y := fixup.o +pci-$(CONFIG_ACPI) += acpi.o +pci-y += legacy.o irq.o +obj-y += $(pci-y) common.o early.o obj-y += amd_bus.o endif