diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-20 19:44:00 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-20 19:44:00 -0500 |
| commit | 6ab33d51713d6d60c7677c0d020910a8cb37e513 (patch) | |
| tree | 546c2ff099b2757e75cf34ddace874f1220f740e /arch/sparc/include/asm/unistd_32.h | |
| parent | 7be6065b39c3f1cfa796667eac1a2170465acc91 (diff) | |
| parent | 13d428afc007fcfcd6deeb215618f54cf9c0cae6 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/ixgbe/ixgbe_main.c
include/net/mac80211.h
net/phonet/af_phonet.c
Diffstat (limited to 'arch/sparc/include/asm/unistd_32.h')
| -rw-r--r-- | arch/sparc/include/asm/unistd_32.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/sparc/include/asm/unistd_32.h b/arch/sparc/include/asm/unistd_32.h index 648643a9f139..0d13d2a4c76f 100644 --- a/arch/sparc/include/asm/unistd_32.h +++ b/arch/sparc/include/asm/unistd_32.h | |||
| @@ -338,8 +338,9 @@ | |||
| 338 | #define __NR_dup3 320 | 338 | #define __NR_dup3 320 |
| 339 | #define __NR_pipe2 321 | 339 | #define __NR_pipe2 321 |
| 340 | #define __NR_inotify_init1 322 | 340 | #define __NR_inotify_init1 322 |
| 341 | #define __NR_accept4 323 | ||
| 341 | 342 | ||
| 342 | #define NR_SYSCALLS 323 | 343 | #define NR_SYSCALLS 324 |
| 343 | 344 | ||
| 344 | /* Sparc 32-bit only has the "setresuid32", "getresuid32" variants, | 345 | /* Sparc 32-bit only has the "setresuid32", "getresuid32" variants, |
| 345 | * it never had the plain ones and there is no value to adding those | 346 | * it never had the plain ones and there is no value to adding those |