diff options
author | Robert Richter <robert.richter@amd.com> | 2008-07-02 16:50:27 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-09 05:44:45 -0400 |
commit | f4d994b541198446fc3d5d4ec5de232e171bf6dd (patch) | |
tree | 799c21618def838f45edc456add2d6f160bd0ede /arch | |
parent | d199a0482791bdf2f052081aa212d8c83ccef88a (diff) |
x86/pci: Makefile merge: coalescing 32 and 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')
-rw-r--r-- | arch/x86/pci/Makefile | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/arch/x86/pci/Makefile b/arch/x86/pci/Makefile index f3643a7be85b..1ba1236094a4 100644 --- a/arch/x86/pci/Makefile +++ b/arch/x86/pci/Makefile | |||
@@ -1,9 +1,7 @@ | |||
1 | ifeq ($(CONFIG_X86_32),y) | ||
2 | |||
3 | obj-y := i386.o init.o | 1 | obj-y := i386.o init.o |
4 | 2 | ||
5 | obj-$(CONFIG_PCI_BIOS) += pcbios.o | 3 | obj-$(CONFIG_PCI_BIOS) += pcbios.o |
6 | obj-$(CONFIG_PCI_MMCONFIG) += mmconfig_32.o direct.o mmconfig-shared.o | 4 | obj-$(CONFIG_PCI_MMCONFIG) += mmconfig_$(BITS).o direct.o mmconfig-shared.o |
7 | obj-$(CONFIG_PCI_DIRECT) += direct.o | 5 | obj-$(CONFIG_PCI_DIRECT) += direct.o |
8 | obj-$(CONFIG_PCI_OLPC) += olpc.o | 6 | obj-$(CONFIG_PCI_OLPC) += olpc.o |
9 | 7 | ||
@@ -23,20 +21,3 @@ pci-$(CONFIG_X86_NUMAQ) += numa.o | |||
23 | 21 | ||
24 | obj-y += $(pci-y) common.o early.o | 22 | obj-y += $(pci-y) common.o early.o |
25 | obj-y += amd_bus.o | 23 | obj-y += amd_bus.o |
26 | |||
27 | else | ||
28 | |||
29 | # | ||
30 | # Makefile for X86_64 specific PCI routines | ||
31 | # | ||
32 | |||
33 | obj-y := i386.o init.o | ||
34 | obj-$(CONFIG_PCI_MMCONFIG) += mmconfig_64.o direct.o mmconfig-shared.o | ||
35 | obj-$(CONFIG_PCI_DIRECT) += direct.o | ||
36 | pci-y := fixup.o | ||
37 | pci-$(CONFIG_ACPI) += acpi.o | ||
38 | pci-y += legacy.o irq.o | ||
39 | obj-y += $(pci-y) common.o early.o | ||
40 | obj-y += amd_bus.o | ||
41 | |||
42 | endif | ||