diff options
| author | David S. Miller <davem@davemloft.net> | 2009-05-19 00:08:20 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-19 00:08:20 -0400 |
| commit | bb803cfbecb03a0cf8dc7e1864f18dda6631af00 (patch) | |
| tree | 6c0989693bea6f50cfa5c6bb14f52ec19668def3 /arch/mn10300/include/asm/unistd.h | |
| parent | 3878fb6fdbceecca20b15748f807340854220f06 (diff) | |
| parent | 511e11e396dc596825ce04d53d7f6d579404bc01 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/scsi/fcoe/fcoe.c
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 543a4f98695d..fef5b434dadc 100644 --- a/arch/mn10300/include/asm/unistd.h +++ b/arch/mn10300/include/asm/unistd.h | |||
| @@ -344,6 +344,8 @@ | |||
| 344 | #define __NR_dup3 331 | 344 | #define __NR_dup3 331 |
| 345 | #define __NR_pipe2 332 | 345 | #define __NR_pipe2 332 |
| 346 | #define __NR_inotify_init1 333 | 346 | #define __NR_inotify_init1 333 |
| 347 | #define __NR_preadv 334 | ||
| 348 | #define __NR_pwritev 335 | ||
| 347 | 349 | ||
| 348 | #ifdef __KERNEL__ | 350 | #ifdef __KERNEL__ |
| 349 | 351 | ||