diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-07-28 09:30:20 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-07-28 09:30:20 +0100 |
| commit | 661299d9d0437a0ff72240f3d60016ac3a361a6e (patch) | |
| tree | 765512576314fc3612b503f182b9ae4e60fcf849 /include/asm-sparc64 | |
| parent | 05caac585f8abd6c0113856bc8858e3ef214d8a6 (diff) | |
| parent | 41c018b7ecb60b1c2c4d5dee0cd37d32a94c45af (diff) | |
| download | kernel_samsung_smdk4412-661299d9d0437a0ff72240f3d60016ac3a361a6e.zip kernel_samsung_smdk4412-661299d9d0437a0ff72240f3d60016ac3a361a6e.tar.gz kernel_samsung_smdk4412-661299d9d0437a0ff72240f3d60016ac3a361a6e.tar.bz2 | |
Merge with Linus' 2.6 tree
Diffstat (limited to 'include/asm-sparc64')
| -rw-r--r-- | include/asm-sparc64/unistd.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-sparc64/unistd.h b/include/asm-sparc64/unistd.h index f59144c..51ec287 100644 --- a/include/asm-sparc64/unistd.h +++ b/include/asm-sparc64/unistd.h @@ -167,12 +167,12 @@ #define __NR_pciconfig_read 148 /* ENOSYS under SunOS */ #define __NR_pciconfig_write 149 /* ENOSYS under SunOS */ #define __NR_getsockname 150 /* Common */ -/* #define __NR_getmsg 151 SunOS Specific */ -/* #define __NR_putmsg 152 SunOS Specific */ +#define __NR_inotify_init 151 /* Linux specific */ +#define __NR_inotify_add_watch 152 /* Linux specific */ #define __NR_poll 153 /* Common */ #define __NR_getdents64 154 /* Linux specific */ /* #define __NR_fcntl64 155 Linux sparc32 Specific */ -/* #define __NR_getdirentries 156 SunOS Specific */ +#define __NR_inotify_rm_watch 156 /* Linux specific */ #define __NR_statfs 157 /* Common */ #define __NR_fstatfs 158 /* Common */ #define __NR_umount 159 /* Common */ |