diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-22 13:23:46 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-22 13:23:46 -0400 |
| commit | 74511020dde10252f8b8e648690d99dba721de14 (patch) | |
| tree | 04fc22bc7dd5d5b8d9294b2e57985b093858bd84 /arch/mn10300/include/asm/unistd.h | |
| parent | 69266866a5790080d7fe80094b28d670ff8aa765 (diff) | |
| parent | 3cc4e53f86dab635166929bfa47cc68d59b28c26 (diff) | |
Merge branch 'for-2.6.34' into for-2.6.35
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 c05acb95c2a..9d056f51592 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 |