diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-18 11:25:29 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-18 11:25:29 -0400 |
| commit | d7bb545d86825e635cab33a1dd81ca0ad7b92887 (patch) | |
| tree | 34da4139ef06ceab6549aea3906639c7413978c8 /arch/cris/kernel/Makefile | |
| parent | 75e98b34155264d943aa53edce465e87f3ccbadf (diff) | |
| parent | 2342e51ba2b52a7f5b78227e6faa4603ed3632a0 (diff) | |
Merge branch 'semaphore' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc
* 'semaphore' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc:
Remove DEBUG_SEMAPHORE from Kconfig
Improve semaphore documentation
Simplify semaphore implementation
Add down_timeout and change ACPI to use it
Introduce down_killable()
Generic semaphore implementation
Add semaphore.h to kernel_lock.c
Fix quota.h includes
Diffstat (limited to 'arch/cris/kernel/Makefile')
| -rw-r--r-- | arch/cris/kernel/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/cris/kernel/Makefile b/arch/cris/kernel/Makefile index c8e8ea570989..ee7bcd4d20b2 100644 --- a/arch/cris/kernel/Makefile +++ b/arch/cris/kernel/Makefile | |||
| @@ -5,8 +5,7 @@ | |||
| 5 | 5 | ||
| 6 | extra-y := vmlinux.lds | 6 | extra-y := vmlinux.lds |
| 7 | 7 | ||
| 8 | obj-y := process.o traps.o irq.o ptrace.o setup.o \ | 8 | obj-y := process.o traps.o irq.o ptrace.o setup.o time.o sys_cris.o |
| 9 | time.o sys_cris.o semaphore.o | ||
| 10 | 9 | ||
| 11 | obj-$(CONFIG_MODULES) += crisksyms.o | 10 | obj-$(CONFIG_MODULES) += crisksyms.o |
| 12 | obj-$(CONFIG_MODULES) += module.o | 11 | obj-$(CONFIG_MODULES) += module.o |