diff options
| author | Tony Lindgren | 2012-11-09 23:58:01 +0100 |
|---|---|---|
| committer | Tony Lindgren | 2012-11-09 23:58:01 +0100 |
| commit | edf8dde393f879fc2d8c22d4bc01ff8d37b80e1a (patch) | |
| tree | 61425adc8b2059a9c12a3ce66ba7361fea1b0bb3 /arch/frv/include/asm/unistd.h | |
| parent | ARM: OMAP: Remove omap_init_consistent_dma_size() (diff) | |
| parent | Linux 3.7-rc4 (diff) | |
| download | kernel-qcow2-linux-edf8dde393f879fc2d8c22d4bc01ff8d37b80e1a.tar.gz kernel-qcow2-linux-edf8dde393f879fc2d8c22d4bc01ff8d37b80e1a.tar.xz kernel-qcow2-linux-edf8dde393f879fc2d8c22d4bc01ff8d37b80e1a.zip | |
Merge branch 'linus' into omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3
Diffstat (limited to 'arch/frv/include/asm/unistd.h')
| -rw-r--r-- | arch/frv/include/asm/unistd.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/frv/include/asm/unistd.h b/arch/frv/include/asm/unistd.h index 266a5b25a0c1..2358634cacca 100644 --- a/arch/frv/include/asm/unistd.h +++ b/arch/frv/include/asm/unistd.h @@ -30,7 +30,6 @@ #define __ARCH_WANT_SYS_RT_SIGACTION #define __ARCH_WANT_SYS_RT_SIGSUSPEND #define __ARCH_WANT_SYS_EXECVE -#define __ARCH_WANT_KERNEL_EXECVE /* * "Conditional" syscalls |