diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2010-03-19 03:05:10 -0400 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-03-19 03:05:10 -0400 |
| commit | b4b7a4ef097f288f724420b473dbf92a89c0ab7e (patch) | |
| tree | 23ad8101e3e77c32a8d1e1b95a9c1cd7f7a475b7 /arch/mn10300/include/asm/unistd.h | |
| parent | e9ce335df51ff782035a15c261a3c0c9892a1767 (diff) | |
| parent | a3d3203e4bb40f253b1541e310dc0f9305be7c84 (diff) | |
Merge branch 'master' into for-linus
Conflicts:
block/Kconfig
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'arch/mn10300/include/asm/unistd.h')
| -rw-r--r-- | arch/mn10300/include/asm/unistd.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/mn10300/include/asm/unistd.h b/arch/mn10300/include/asm/unistd.h index c05acb95c2a9..9d056f515929 100644 --- a/arch/mn10300/include/asm/unistd.h +++ b/arch/mn10300/include/asm/unistd.h | |||
| @@ -363,6 +363,7 @@ | |||
| 363 | #define __ARCH_WANT_STAT64 | 363 | #define __ARCH_WANT_STAT64 |
| 364 | #define __ARCH_WANT_SYS_ALARM | 364 | #define __ARCH_WANT_SYS_ALARM |
| 365 | #define __ARCH_WANT_SYS_GETHOSTNAME | 365 | #define __ARCH_WANT_SYS_GETHOSTNAME |
| 366 | #define __ARCH_WANT_SYS_IPC | ||
| 366 | #define __ARCH_WANT_SYS_PAUSE | 367 | #define __ARCH_WANT_SYS_PAUSE |
| 367 | #define __ARCH_WANT_SYS_SGETMASK | 368 | #define __ARCH_WANT_SYS_SGETMASK |
| 368 | #define __ARCH_WANT_SYS_SIGNAL | 369 | #define __ARCH_WANT_SYS_SIGNAL |
| @@ -375,6 +376,7 @@ | |||
| 375 | #define __ARCH_WANT_SYS_LLSEEK | 376 | #define __ARCH_WANT_SYS_LLSEEK |
| 376 | #define __ARCH_WANT_SYS_NICE | 377 | #define __ARCH_WANT_SYS_NICE |
| 377 | #define __ARCH_WANT_SYS_OLD_GETRLIMIT | 378 | #define __ARCH_WANT_SYS_OLD_GETRLIMIT |
| 379 | #define __ARCH_WANT_SYS_OLD_SELECT | ||
| 378 | #define __ARCH_WANT_SYS_OLDUMOUNT | 380 | #define __ARCH_WANT_SYS_OLDUMOUNT |
| 379 | #define __ARCH_WANT_SYS_SIGPENDING | 381 | #define __ARCH_WANT_SYS_SIGPENDING |
| 380 | #define __ARCH_WANT_SYS_SIGPROCMASK | 382 | #define __ARCH_WANT_SYS_SIGPROCMASK |