diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-11 15:22:18 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-11 15:22:18 -0400 |
| commit | 6c82a000a29b93541b5b7db597a083c069755cc9 (patch) | |
| tree | b9e49724f56b47e4b3d0bd6c6fa3be88dac3a9e6 /arch/x86/pci/Makefile | |
| parent | 5b4d2386c23e5de553fce002892c7691a989b350 (diff) | |
| parent | 39415a440ecceb0a5bd3c23686f18f83bb8368c6 (diff) | |
Merge branch 'x86/generalize-visws' into x86/core
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 99d9f095e4d4..e515e8db842a 100644 --- a/arch/x86/pci/Makefile +++ b/arch/x86/pci/Makefile | |||
| @@ -9,9 +9,7 @@ pci-y := fixup.o | |||
| 9 | pci-$(CONFIG_ACPI) += acpi.o | 9 | pci-$(CONFIG_ACPI) += acpi.o |
| 10 | pci-y += legacy.o irq.o | 10 | pci-y += legacy.o irq.o |
| 11 | 11 | ||
| 12 | # Careful: VISWS overrule the pci-y above. The colons are | 12 | pci-$(CONFIG_X86_VISWS) += visws.o |
| 13 | # therefor correct. This needs a proper fix by distangling the code. | ||
| 14 | pci-$(CONFIG_X86_VISWS) := visws.o fixup.o | ||
| 15 | 13 | ||
| 16 | pci-$(CONFIG_X86_NUMAQ) += numa.o | 14 | pci-$(CONFIG_X86_NUMAQ) += numa.o |
| 17 | 15 | ||