diff options
author | Todd Poynor <tpoynor@mvista.com> | 2005-07-12 03:34:39 +0100 |
---|---|---|
committer | Thomas Gleixner <tglx@mtd.linutronix.de> | 2005-07-13 00:58:44 +0200 |
commit | a98a5d04f400ad112e59cadd739dbabf89417e60 (patch) | |
tree | 5eeb7f45c0090de40c7523e2b9dfd5e86b22169e /include/asm-sparc | |
parent | 751382dd5cb2702368d281a50b55c2d6c4e8fbfc (diff) | |
parent | 7ac3db59fd4410405ce55e2a25c397aec440d8da (diff) | |
download | kernel_samsung_tuna-a98a5d04f400ad112e59cadd739dbabf89417e60.zip kernel_samsung_tuna-a98a5d04f400ad112e59cadd739dbabf89417e60.tar.gz kernel_samsung_tuna-a98a5d04f400ad112e59cadd739dbabf89417e60.tar.bz2 |
Merge with rsync://fileserver/linux
Diffstat (limited to 'include/asm-sparc')
-rw-r--r-- | include/asm-sparc/unistd.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-sparc/unistd.h b/include/asm-sparc/unistd.h index 8467084..aee17d7 100644 --- a/include/asm-sparc/unistd.h +++ b/include/asm-sparc/unistd.h @@ -212,7 +212,7 @@ #define __NR_epoll_create 193 /* Linux Specific */ #define __NR_epoll_ctl 194 /* Linux Specific */ #define __NR_epoll_wait 195 /* Linux Specific */ -/* #define __NR_ulimit 196 Linux Specific */ +#define __NR_ioprio_set 196 /* Linux Specific */ #define __NR_getppid 197 /* Linux Specific */ #define __NR_sigaction 198 /* Linux Specific */ #define __NR_sgetmask 199 /* Linux Specific */ @@ -234,7 +234,7 @@ #define __NR_ipc 215 /* Linux Specific */ #define __NR_sigreturn 216 /* Linux Specific */ #define __NR_clone 217 /* Linux Specific */ -/* #define __NR_modify_ldt 218 Linux Specific - i386 specific, unused */ +#define __NR_ioprio_get 218 /* Linux Specific */ #define __NR_adjtimex 219 /* Linux Specific */ #define __NR_sigprocmask 220 /* Linux Specific */ #define __NR_create_module 221 /* Linux Specific */ |