summaryrefslogtreecommitdiff
path: root/arch/ia64/include/asm/signal.h
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2009-06-19 02:20:55 +0400
committerJames Morris <jmorris@namei.org>2009-06-19 02:20:55 +0400
commitd905163c5b23f6d8511971e06081a1b525e8a0bd (patch)
treef76918c1be802ec068d37763466f5518efdb690e /arch/ia64/include/asm/signal.h
parent44c2d9bdd7022ca7d240d5adc009296fc1c6ce08 (diff)
parent0732f87761dbe417cb6e084b712d07e879e876ef (diff)
downloadlinux-d905163c5b23f6d8511971e06081a1b525e8a0bd.tar.xz
Merge branch 'master' into next
Diffstat (limited to 'arch/ia64/include/asm/signal.h')
-rw-r--r--arch/ia64/include/asm/signal.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/signal.h b/arch/ia64/include/asm/signal.h
index 4f5ca5643cb1..b166248d49a4 100644
--- a/arch/ia64/include/asm/signal.h
+++ b/arch/ia64/include/asm/signal.h
@@ -114,7 +114,7 @@
#endif /* __KERNEL__ */
-#include <asm-generic/signal.h>
+#include <asm-generic/signal-defs.h>
# ifndef __ASSEMBLY__