diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-02-12 13:08:57 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-12 13:08:57 +0100 |
| commit | 871cafcc962fa1655c44b4f0e54d4c5cc14e273c (patch) | |
| tree | fdb7bc65d2606c85b7be6c33ba0dfd5b4e472245 /kernel/Makefile | |
| parent | softlockup: ensure the task has been switched out once (diff) | |
| parent | Merge git://git.infradead.org/users/cbou/battery-2.6.29 (diff) | |
| download | linux-dev-871cafcc962fa1655c44b4f0e54d4c5cc14e273c.tar.xz linux-dev-871cafcc962fa1655c44b4f0e54d4c5cc14e273c.zip | |
Merge branch 'linus' into core/softlockup
Diffstat (limited to 'kernel/Makefile')
| -rw-r--r-- | kernel/Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/Makefile b/kernel/Makefile index 979745f1b4bc..ae6565b3dced 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -40,9 +40,8 @@ obj-$(CONFIG_RT_MUTEXES) += rtmutex.o obj-$(CONFIG_DEBUG_RT_MUTEXES) += rtmutex-debug.o obj-$(CONFIG_RT_MUTEX_TESTER) += rtmutex-tester.o obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o -ifeq ($(CONFIG_USE_GENERIC_SMP_HELPERS),y) -obj-y += smp.o -else +obj-$(CONFIG_USE_GENERIC_SMP_HELPERS) += smp.o +ifneq ($(CONFIG_SMP),y) obj-y += up.o endif obj-$(CONFIG_SMP) += spinlock.o |