diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
| commit | ad34ea2cc3845ef4dcd7d12fb0fa8484734bd672 (patch) | |
| tree | ad434400f5ecaa33b433c8f830e40792d8d6c05c /include/asm-arm/unistd.h | |
| parent | 90356ac3194bf91a441a5f9c3067af386ef62462 (diff) | |
| parent | 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 (diff) | |
merge by hand - fix up rejections in Documentation/DocBook/Makefile
Diffstat (limited to 'include/asm-arm/unistd.h')
| -rw-r--r-- | include/asm-arm/unistd.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/asm-arm/unistd.h b/include/asm-arm/unistd.h index a19ec09eaa01..ace27480886e 100644 --- a/include/asm-arm/unistd.h +++ b/include/asm-arm/unistd.h | |||
| @@ -359,8 +359,7 @@ | |||
| 359 | #define __ARM_NR_cacheflush (__ARM_NR_BASE+2) | 359 | #define __ARM_NR_cacheflush (__ARM_NR_BASE+2) |
| 360 | #define __ARM_NR_usr26 (__ARM_NR_BASE+3) | 360 | #define __ARM_NR_usr26 (__ARM_NR_BASE+3) |
| 361 | #define __ARM_NR_usr32 (__ARM_NR_BASE+4) | 361 | #define __ARM_NR_usr32 (__ARM_NR_BASE+4) |
| 362 | 362 | #define __ARM_NR_set_tls (__ARM_NR_BASE+5) | |
| 363 | #define __ARM_NR_set_tls (__ARM_NR_BASE+0x800) | ||
| 364 | 363 | ||
| 365 | #define __sys2(x) #x | 364 | #define __sys2(x) #x |
| 366 | #define __sys1(x) __sys2(x) | 365 | #define __sys1(x) __sys2(x) |