diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-13 13:39:00 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-13 13:39:00 +1000 |
| commit | f2603c77e8cd7777742da9eb8feea06fbd85c267 (patch) | |
| tree | a2ecf7df8e2aed5db5fd58987390bb7ca65715d5 /arch/x86/pci/Makefile_32 | |
| parent | 9546e899e803ea8e738911b36bfcfe020031eefe (diff) | |
| parent | 0536899878853e1963e516c322d4578dc5b4fcd0 (diff) | |
Merge commit 'x86/auto-x86-next'
Conflicts:
arch/x86/kernel/io_apic_32.c
arch/x86/kernel/nmi_32.c
arch/x86/kernel/process_32.c
arch/x86/kernel/process_64.c
Diffstat (limited to 'arch/x86/pci/Makefile_32')
| -rw-r--r-- | arch/x86/pci/Makefile_32 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/pci/Makefile_32 b/arch/x86/pci/Makefile_32 index 89ec35d00efd..962d96c0495a 100644 --- a/arch/x86/pci/Makefile_32 +++ b/arch/x86/pci/Makefile_32 @@ -13,10 +13,11 @@ pci-y := fixup.o pci-$(CONFIG_ACPI) += acpi.o pci-y += legacy.o irq.o -# Careful: VISWS and NUMAQ overrule the pci-y above. The colons are +# Careful: VISWS overrule the pci-y above. The colons are # therefor correct. This needs a proper fix by distangling the code. pci-$(CONFIG_X86_VISWS) := visws.o fixup.o -pci-$(CONFIG_X86_NUMAQ) := numa.o irq.o + +pci-$(CONFIG_X86_NUMAQ) += numa.o # Necessary for NUMAQ as well pci-$(CONFIG_NUMA) += mp_bus_to_node.o |