diff options
author | Robert Richter <robert.richter@amd.com> | 2008-07-02 16:50:22 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-09 05:44:16 -0400 |
commit | a5d4fb94f750e439a0722c0a76c9aade3a9199be (patch) | |
tree | 1cef980cad01ff6cbd4b398dbddd663223906326 /arch/x86/pci/Makefile | |
parent | 0b40e84ab750b4ba5fc8d6712c892502dc93b212 (diff) |
x86/pci: Makefile merge: decoupling options for mp_bus_to_node.o
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 | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/pci/Makefile b/arch/x86/pci/Makefile index 30944bc5252d..044fa5bb2ff6 100644 --- a/arch/x86/pci/Makefile +++ b/arch/x86/pci/Makefile | |||
@@ -14,6 +14,7 @@ pci-y := fixup.o | |||
14 | # legacy/irq.o | 14 | # legacy/irq.o |
15 | pci-$(CONFIG_ACPI) += acpi.o | 15 | pci-$(CONFIG_ACPI) += acpi.o |
16 | pci-y += legacy.o irq.o | 16 | pci-y += legacy.o irq.o |
17 | pci-$(CONFIG_NUMA) += mp_bus_to_node.o | ||
17 | 18 | ||
18 | # Careful: VISWS overrule the pci-y above. The colons are | 19 | # Careful: VISWS overrule the pci-y above. The colons are |
19 | # therefor correct. This needs a proper fix by distangling the code. | 20 | # therefor correct. This needs a proper fix by distangling the code. |
@@ -21,9 +22,6 @@ pci-$(CONFIG_X86_VISWS) := visws.o fixup.o | |||
21 | 22 | ||
22 | pci-$(CONFIG_X86_NUMAQ) += numa.o | 23 | pci-$(CONFIG_X86_NUMAQ) += numa.o |
23 | 24 | ||
24 | # Necessary for NUMAQ as well | ||
25 | pci-$(CONFIG_NUMA) += mp_bus_to_node.o | ||
26 | |||
27 | obj-y += $(pci-y) common.o early.o | 25 | obj-y += $(pci-y) common.o early.o |
28 | obj-y += amd_bus.o | 26 | obj-y += amd_bus.o |
29 | 27 | ||