diff options
author | Robert Richter <robert.richter@amd.com> | 2008-07-02 16:50:24 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-09 05:44:28 -0400 |
commit | 8eefc6640311bb56408fa0abe3f2930b3037f91a (patch) | |
tree | bd019fea2d845f1fc6067dac3d6666c3c46fc52a /arch/x86/pci/Makefile | |
parent | 8043c7be4b8dabaaeed8344dd0a4cbaa9a94fb71 (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/Makefile')
-rw-r--r-- | arch/x86/pci/Makefile | 8 |
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 | |||
34 | obj-y := i386.o init.o | 34 | obj-y := i386.o init.o |
35 | obj-$(CONFIG_PCI_MMCONFIG) += mmconfig_64.o direct.o mmconfig-shared.o | 35 | obj-$(CONFIG_PCI_MMCONFIG) += mmconfig_64.o direct.o mmconfig-shared.o |
36 | obj-$(CONFIG_PCI_DIRECT) += direct.o | 36 | obj-$(CONFIG_PCI_DIRECT) += direct.o |
37 | obj-y += fixup.o | 37 | pci-y := fixup.o |
38 | obj-$(CONFIG_ACPI) += acpi.o | 38 | pci-$(CONFIG_ACPI) += acpi.o |
39 | obj-y += legacy.o irq.o | 39 | pci-y += legacy.o irq.o |
40 | obj-y += common.o early.o | 40 | obj-y += $(pci-y) common.o early.o |
41 | obj-y += amd_bus.o | 41 | obj-y += amd_bus.o |
42 | 42 | ||
43 | endif | 43 | endif |