summaryrefslogtreecommitdiff
path: root/include/asm-ia64
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-04-22 02:41:27 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-22 02:41:27 +0400
commit429f731dea577bdd43693940cdca524135287e6a (patch)
tree932337b7d23dd736612c6b6e6601c50bc24cfc5f /include/asm-ia64
parent85b375a613085b78531ec86369a51c2f3b922f95 (diff)
parentd2f5e80862d33a7746a40569840248a592dbc395 (diff)
downloadlinux-429f731dea577bdd43693940cdca524135287e6a.tar.xz
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: Deprecate the asm/semaphore.h files in feature-removal-schedule. Convert asm/semaphore.h users to linux/semaphore.h security: Remove unnecessary inclusions of asm/semaphore.h lib: Remove unnecessary inclusions of asm/semaphore.h kernel: Remove unnecessary inclusions of asm/semaphore.h include: Remove unnecessary inclusions of asm/semaphore.h fs: Remove unnecessary inclusions of asm/semaphore.h drivers: Remove unnecessary inclusions of asm/semaphore.h net: Remove unnecessary inclusions of asm/semaphore.h arch: Remove unnecessary inclusions of asm/semaphore.h
Diffstat (limited to 'include/asm-ia64')
-rw-r--r--include/asm-ia64/sn/nodepda.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-ia64/sn/nodepda.h b/include/asm-ia64/sn/nodepda.h
index 6f6d69e39ff5..ee118b901de4 100644
--- a/include/asm-ia64/sn/nodepda.h
+++ b/include/asm-ia64/sn/nodepda.h
@@ -9,7 +9,6 @@
#define _ASM_IA64_SN_NODEPDA_H
-#include <asm/semaphore.h>
#include <asm/irq.h>
#include <asm/sn/arch.h>
#include <asm/sn/intr.h>