diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2013-03-29 15:12:10 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-03-29 15:12:21 +0100 |
| commit | 6aeedba20e82150757f2dd5b896f0e09491a987c (patch) | |
| tree | d33322d9a9bd8c1b3d16019820a3305c3692385b /arch/microblaze/include/asm/unistd.h | |
| parent | HID: multitouch: fix touchpad buttons (diff) | |
| parent | Linux 3.9-rc1 (diff) | |
| download | linux-6aeedba20e82150757f2dd5b896f0e09491a987c.tar.xz linux-6aeedba20e82150757f2dd5b896f0e09491a987c.zip | |
Merge tag v3.9-rc1 into for-3.9/upstream-fixes
This is done so that I am able to apply fix for commit
0322bd3980b3 ("usb hid quirks for Masterkit MA901 usb radio") which
went into 3.9-rc1.
Diffstat (limited to 'arch/microblaze/include/asm/unistd.h')
| -rw-r--r-- | arch/microblaze/include/asm/unistd.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/microblaze/include/asm/unistd.h b/arch/microblaze/include/asm/unistd.h index 10f8ac186855..b3778391d9cc 100644 --- a/arch/microblaze/include/asm/unistd.h +++ b/arch/microblaze/include/asm/unistd.h @@ -33,8 +33,6 @@ #define __ARCH_WANT_SYS_OLDUMOUNT #define __ARCH_WANT_SYS_SIGPENDING #define __ARCH_WANT_SYS_SIGPROCMASK -#define __ARCH_WANT_SYS_RT_SIGACTION -#define __ARCH_WANT_SYS_RT_SIGSUSPEND #define __ARCH_WANT_SYS_CLONE #define __ARCH_WANT_SYS_VFORK #define __ARCH_WANT_SYS_FORK |