diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-16 04:09:10 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-16 04:09:10 -0500 |
| commit | af2519fb2298cdf7540082c36f4d8c66bbff103f (patch) | |
| tree | 1d290d28d42d42f9e693457762c4008988628060 /kernel/Makefile | |
| parent | 961d7d0ee5150e0197cc81c2a8884ecb230276e2 (diff) | |
| parent | 7cb36b6ccdca03bd87e8faca7fd920643dd1aec7 (diff) | |
Merge branch 'linus' into core/iommu
Conflicts:
arch/ia64/include/asm/dma-mapping.h
arch/ia64/include/asm/machvec.h
arch/ia64/include/asm/machvec_sn2.h
Diffstat (limited to 'kernel/Makefile')
| -rw-r--r-- | kernel/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/Makefile b/kernel/Makefile index 2921d90ce32f..170a9213c1b6 100644 --- a/kernel/Makefile +++ b/kernel/Makefile | |||
| @@ -41,6 +41,9 @@ obj-$(CONFIG_DEBUG_RT_MUTEXES) += rtmutex-debug.o | |||
| 41 | obj-$(CONFIG_RT_MUTEX_TESTER) += rtmutex-tester.o | 41 | obj-$(CONFIG_RT_MUTEX_TESTER) += rtmutex-tester.o |
| 42 | obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o | 42 | obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o |
| 43 | obj-$(CONFIG_USE_GENERIC_SMP_HELPERS) += smp.o | 43 | obj-$(CONFIG_USE_GENERIC_SMP_HELPERS) += smp.o |
| 44 | ifneq ($(CONFIG_SMP),y) | ||
| 45 | obj-y += up.o | ||
| 46 | endif | ||
| 44 | obj-$(CONFIG_SMP) += spinlock.o | 47 | obj-$(CONFIG_SMP) += spinlock.o |
| 45 | obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock.o | 48 | obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock.o |
| 46 | obj-$(CONFIG_PROVE_LOCKING) += spinlock.o | 49 | obj-$(CONFIG_PROVE_LOCKING) += spinlock.o |