diff options
author | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
commit | d120cfb544ed6161b9d32fb6c4648c471807ee6b (patch) | |
tree | 7757ad0198d8df76ff5c60f939a687687c41da00 /kernel/Makefile | |
parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff) | |
parent | bf7e8511088963078484132636839b59e25cf14f (diff) |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
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 752bd7d383af..82fb182f6f61 100644 --- a/kernel/Makefile +++ b/kernel/Makefile | |||
@@ -16,6 +16,9 @@ obj-$(CONFIG_FUTEX) += futex.o | |||
16 | ifeq ($(CONFIG_COMPAT),y) | 16 | ifeq ($(CONFIG_COMPAT),y) |
17 | obj-$(CONFIG_FUTEX) += futex_compat.o | 17 | obj-$(CONFIG_FUTEX) += futex_compat.o |
18 | endif | 18 | endif |
19 | obj-$(CONFIG_RT_MUTEXES) += rtmutex.o | ||
20 | obj-$(CONFIG_DEBUG_RT_MUTEXES) += rtmutex-debug.o | ||
21 | obj-$(CONFIG_RT_MUTEX_TESTER) += rtmutex-tester.o | ||
19 | obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o | 22 | obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o |
20 | obj-$(CONFIG_SMP) += cpu.o spinlock.o | 23 | obj-$(CONFIG_SMP) += cpu.o spinlock.o |
21 | obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock.o | 24 | obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock.o |