aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-sparc
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-04-18 05:39:23 -0400
committerJeff Garzik <jeff@garzik.org>2006-04-18 05:39:23 -0400
commit9e73972cef1c0961c78b0e0b61c4ecc275b29f04 (patch)
tree27907bbd653504d71ff47cb00bdf8cd61e82f126 /include/asm-sparc
parenta890b15c0990cc8d686edcc85f5fccde71ad5ce9 (diff)
parent4741c336d27dec3ea68a35659abb8dc82b142388 (diff)
Merge branch 'upstream'
Diffstat (limited to 'include/asm-sparc')
-rw-r--r--include/asm-sparc/unistd.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-sparc/unistd.h b/include/asm-sparc/unistd.h
index 264f0ebeaedc..2a911aa4cae9 100644
--- a/include/asm-sparc/unistd.h
+++ b/include/asm-sparc/unistd.h
@@ -296,7 +296,7 @@
296#define __NR_mq_notify 277 296#define __NR_mq_notify 277
297#define __NR_mq_getsetattr 278 297#define __NR_mq_getsetattr 278
298#define __NR_waitid 279 298#define __NR_waitid 279
299#define __NR_sys_setaltroot 280 299#define __NR_tee 280
300#define __NR_add_key 281 300#define __NR_add_key 281
301#define __NR_request_key 282 301#define __NR_request_key 282
302#define __NR_keyctl 283 302#define __NR_keyctl 283