summaryrefslogtreecommitdiffstats
path: root/include/asm-ia64
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-24 12:24:40 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-24 12:24:40 -0700
commit7540081c6b16dc941895bca840749cabfd0d3b48 (patch)
tree9e6b2270d700bf99489b570aa2b4c2c0b6cd0ead /include/asm-ia64
parent3fde80e94c2bbffbb13f5faa3340cf438440ebea (diff)
parentb552068999b0b05087c454e525b30b785c79dc9b (diff)
downloadlinux-7540081c6b16dc941895bca840749cabfd0d3b48.tar.gz
linux-7540081c6b16dc941895bca840749cabfd0d3b48.tar.bz2
linux-7540081c6b16dc941895bca840749cabfd0d3b48.zip
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 __DECLARE_SEMAPHORE_GENERIC Remove asm/semaphore.h Remove use of asm/semaphore.h Add missing semaphore.h includes Remove mention of semaphores from kernel-locking
Diffstat (limited to 'include/asm-ia64')
-rw-r--r--include/asm-ia64/semaphore.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-ia64/semaphore.h b/include/asm-ia64/semaphore.h
deleted file mode 100644
index d9b2034ed1d2..000000000000
--- a/include/asm-ia64/semaphore.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <linux/semaphore.h>