diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2013-04-30 12:30:24 +0200 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2013-04-30 12:42:13 +0200 |
| commit | a614e1923d5389d01f3545ee4a90e39a04d0c90d (patch) | |
| tree | e8e32dba12a66ffd26d78f015a142ac28e19ad8e /arch/mips/include/asm/signal.h | |
| parent | Merge remote-tracking branch 'efi/chainsaw' into x86/efi (diff) | |
| parent | Linux 3.9 (diff) | |
| download | linux-a614e1923d5389d01f3545ee4a90e39a04d0c90d.tar.xz linux-a614e1923d5389d01f3545ee4a90e39a04d0c90d.zip | |
Merge tag 'v3.9' into efi-for-tip2
Resolve conflicts for Ingo.
Conflicts:
drivers/firmware/Kconfig
drivers/firmware/efivars.c
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
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 197f6367c201..8efe5a9e2c3e 100644 --- a/arch/mips/include/asm/signal.h +++ b/arch/mips/include/asm/signal.h @@ -21,6 +21,6 @@ #include <asm/sigcontext.h> #include <asm/siginfo.h> -#define __ARCH_HAS_ODD_SIGACTION +#define __ARCH_HAS_IRIX_SIGACTION #endif /* _ASM_SIGNAL_H */ |