summaryrefslogtreecommitdiff
path: root/arch/arm/include/asm/signal.h
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-06-15 00:36:54 (GMT)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-06-15 00:36:54 (GMT)
commit7dafd239ab522d38979ebe44d79aa68ad7b1a383 (patch)
tree04754a0c6495e57c1fe5f417fbfc99272d353c0e /arch/arm/include/asm/signal.h
parentbc47ab0241c7c86da4f5e5f82fbca7d45387c18d (diff)
parent45e3e1935e2857c54783291107d33323b3ef33c8 (diff)
downloadlinux-7dafd239ab522d38979ebe44d79aa68ad7b1a383.tar.xz
Merge commit 'origin/master' into next
Diffstat (limited to 'arch/arm/include/asm/signal.h')
-rw-r--r--arch/arm/include/asm/signal.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/signal.h b/arch/arm/include/asm/signal.h
index d0fb487..43ba0fb 100644
--- a/arch/arm/include/asm/signal.h
+++ b/arch/arm/include/asm/signal.h
@@ -111,7 +111,7 @@ typedef unsigned long sigset_t;
#define MINSIGSTKSZ 2048
#define SIGSTKSZ 8192
-#include <asm-generic/signal.h>
+#include <asm-generic/signal-defs.h>
#ifdef __KERNEL__
struct old_sigaction {