diff options
author | Robert Richter <robert.richter@amd.com> | 2008-07-02 22:50:22 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-09 11:44:16 +0200 |
commit | a5d4fb94f750e439a0722c0a76c9aade3a9199be (patch) | |
tree | 1cef980cad01ff6cbd4b398dbddd663223906326 | |
parent | 0b40e84ab750b4ba5fc8d6712c892502dc93b212 (diff) | |
download | op-kernel-dev-a5d4fb94f750e439a0722c0a76c9aade3a9199be.zip op-kernel-dev-a5d4fb94f750e439a0722c0a76c9aade3a9199be.tar.gz |
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>
-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 30944bc..044fa5b 100644 --- a/arch/x86/pci/Makefile +++ b/arch/x86/pci/Makefile @@ -14,6 +14,7 @@ pci-y := fixup.o # legacy/irq.o pci-$(CONFIG_ACPI) += acpi.o pci-y += legacy.o irq.o +pci-$(CONFIG_NUMA) += mp_bus_to_node.o # Careful: VISWS overrule the pci-y above. The colons are # therefor correct. This needs a proper fix by distangling the code. @@ -21,9 +22,6 @@ pci-$(CONFIG_X86_VISWS) := visws.o fixup.o pci-$(CONFIG_X86_NUMAQ) += numa.o -# Necessary for NUMAQ as well -pci-$(CONFIG_NUMA) += mp_bus_to_node.o - obj-y += $(pci-y) common.o early.o obj-y += amd_bus.o |