diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-10 10:16:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-10 10:16:07 -0700 |
| commit | 72c1c2f1be6b6574c434bd60991269786c2431a2 (patch) | |
| tree | c86e89ccb964607b906be98dbc3a01b86dcb099a /arch/microblaze/include/uapi/asm/unistd.h | |
| parent | 2d6244b3cc936c35101171dab0aa9123e96f800c (diff) | |
| parent | 4937a269cb063915d50e47c68493679b7fe0ffb7 (diff) | |
| download | blackbird-op-linux-72c1c2f1be6b6574c434bd60991269786c2431a2.tar.gz blackbird-op-linux-72c1c2f1be6b6574c434bd60991269786c2431a2.zip | |
Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze
Pull microblaze update from Michal Simek:
"This Microblaze merge window is quite minimal.
I have also added to my branch one xilinx systemace sparse fix because
haven't got any reply from block maintainer."
* 'next' of git://git.monstr.eu/linux-2.6-microblaze:
xilinx systemace: Fix sparse warnings
microblaze: Move __NR_syscalls from uapi
microblaze: Enable KGDB in defconfig
microblaze: Don't mark arch_kgdb_ops as const.
Diffstat (limited to 'arch/microblaze/include/uapi/asm/unistd.h')
| -rw-r--r-- | arch/microblaze/include/uapi/asm/unistd.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/microblaze/include/uapi/asm/unistd.h b/arch/microblaze/include/uapi/asm/unistd.h index 5f7fe7582f3a..20043b67d158 100644 --- a/arch/microblaze/include/uapi/asm/unistd.h +++ b/arch/microblaze/include/uapi/asm/unistd.h @@ -397,6 +397,4 @@ #define __NR_kcmp 379 #define __NR_finit_module 380 -#define __NR_syscalls 381 - #endif /* _UAPI_ASM_MICROBLAZE_UNISTD_H */ |
