diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-18 08:25:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-18 08:25:29 -0700 |
| commit | d7bb545d86825e635cab33a1dd81ca0ad7b92887 (patch) | |
| tree | 34da4139ef06ceab6549aea3906639c7413978c8 /arch/alpha/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/alpha/kernel/Makefile')
| -rw-r--r-- | arch/alpha/kernel/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/kernel/Makefile b/arch/alpha/kernel/Makefile index dccf05245d4..ac706c1d7ad 100644 --- a/arch/alpha/kernel/Makefile +++ b/arch/alpha/kernel/Makefile @@ -7,7 +7,7 @@ EXTRA_AFLAGS := $(KBUILD_CFLAGS) EXTRA_CFLAGS := -Werror -Wno-sign-compare obj-y := entry.o traps.o process.o init_task.o osf_sys.o irq.o \ - irq_alpha.o signal.o setup.o ptrace.o time.o semaphore.o \ + irq_alpha.o signal.o setup.o ptrace.o time.o \ alpha_ksyms.o systbls.o err_common.o io.o obj-$(CONFIG_VGA_HOSE) += console.o |