diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-04-30 23:05:52 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-04-30 23:15:35 +0200 |
| commit | 895d30935ebe05f192e844792668bf8d19deaae7 (patch) | |
| tree | 1648ca3e3fcfb3f07590efc6eb485af2466de671 | |
| parent | 6b8e1c7ec4af6defa7045ff3c9b266486124d9c5 (diff) | |
| download | linux-stable-895d30935ebe05f192e844792668bf8d19deaae7.tar.gz linux-stable-895d30935ebe05f192e844792668bf8d19deaae7.tar.bz2 linux-stable-895d30935ebe05f192e844792668bf8d19deaae7.zip | |
x86: numaq fix
do not override the existing pci-y rule when adding visws or
numaq rules.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | arch/x86/pci/Makefile_32 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/pci/Makefile_32 b/arch/x86/pci/Makefile_32 index 2a1516efb542..7fa519868d70 100644 --- a/arch/x86/pci/Makefile_32 +++ b/arch/x86/pci/Makefile_32 @@ -9,8 +9,8 @@ pci-y := fixup.o pci-$(CONFIG_ACPI) += acpi.o pci-y += legacy.o irq.o -pci-$(CONFIG_X86_VISWS) := visws.o fixup.o -pci-$(CONFIG_X86_NUMAQ) := numa.o irq.o +pci-$(CONFIG_X86_VISWS) += visws.o fixup.o +pci-$(CONFIG_X86_NUMAQ) += numa.o irq.o pci-$(CONFIG_NUMA) += mp_bus_to_node.o obj-y += $(pci-y) common.o early.o |