diff options
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-09-03 08:26:33 +0200 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-09-03 08:26:33 +0200 |
commit | c50e86ce7c2961a41f2f7aa6e4fd6c99229ba205 (patch) | |
tree | 4ea36009719bd8fc523239fe1bdccb90f0dce3ae /arch/mn10300/include/asm/unistd.h | |
parent | OMAPDSS: Correct DISPC_IRQ bit definitions for LCD3 (diff) | |
parent | Linux 3.6-rc4 (diff) | |
download | linux-c50e86ce7c2961a41f2f7aa6e4fd6c99229ba205.tar.xz linux-c50e86ce7c2961a41f2f7aa6e4fd6c99229ba205.zip |
Merge tag 'v3.6-rc4'
Merge 3.6-rc4 to get latest OMAP and device tree fixes.
Diffstat (limited to 'arch/mn10300/include/asm/unistd.h')
-rw-r--r-- | arch/mn10300/include/asm/unistd.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mn10300/include/asm/unistd.h b/arch/mn10300/include/asm/unistd.h index 9051f921cbc7..866eb14749d7 100644 --- a/arch/mn10300/include/asm/unistd.h +++ b/arch/mn10300/include/asm/unistd.h @@ -358,7 +358,6 @@ /* * specify the deprecated syscalls we want to support on this arch */ -#define __ARCH_WANT_IPC_PARSE_VERSION #define __ARCH_WANT_OLD_READDIR #define __ARCH_WANT_OLD_STAT #define __ARCH_WANT_STAT64 |