diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-06-02 16:33:24 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-06-02 16:33:24 +1000 |
| commit | 4c16e7043a10d3394e4d09b1471f2cf4829ae0df (patch) | |
| tree | a39dfb1227afa444658ace322433d74f0a555037 /arch/mips/include/asm/signal.h | |
| parent | 74e806dd26d6f63cbadd8fdb3a836c13c2da40b2 (diff) | |
| parent | 09254cf49e0f3ea98a053bc3a6dab188f9a9a526 (diff) | |
Merge commit 'asm-generic/next'
Conflicts:
arch/arm/include/asm/page.h
Diffstat (limited to 'arch/mips/include/asm/signal.h')
| -rw-r--r-- | arch/mips/include/asm/signal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/include/asm/signal.h b/arch/mips/include/asm/signal.h index bee5153aca48..c783f364938c 100644 --- a/arch/mips/include/asm/signal.h +++ b/arch/mips/include/asm/signal.h @@ -109,7 +109,7 @@ typedef unsigned long old_sigset_t; /* at least 32 bits */ #define SIG_UNBLOCK 2 /* for unblocking signals */ #define SIG_SETMASK 3 /* for setting the signal mask */ -#include <asm-generic/signal.h> +#include <asm-generic/signal-defs.h> struct sigaction { unsigned int sa_flags; |