diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-10-06 11:36:55 -0400 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-10-06 11:36:55 -0400 |
| commit | d94e5fcbf1420366dcb4102bafe04dbcfc0d0d4b (patch) | |
| tree | a9b7de7df6da5c3132cc68169b9c47ba288ccd42 /arch/sparc/include/asm/socket.h | |
| parent | d55651168a20078a94597a297d5cdfd807bf07b6 (diff) | |
| parent | 374576a8b6f865022c0fd1ca62396889b23d66dd (diff) | |
Merge commit 'v2.6.32-rc3'
Diffstat (limited to 'arch/sparc/include/asm/socket.h')
| -rw-r--r-- | arch/sparc/include/asm/socket.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/sparc/include/asm/socket.h b/arch/sparc/include/asm/socket.h index 982a12f959f4..3a5ae3d12088 100644 --- a/arch/sparc/include/asm/socket.h +++ b/arch/sparc/include/asm/socket.h | |||
| @@ -29,6 +29,9 @@ | |||
| 29 | #define SO_RCVBUFFORCE 0x100b | 29 | #define SO_RCVBUFFORCE 0x100b |
| 30 | #define SO_ERROR 0x1007 | 30 | #define SO_ERROR 0x1007 |
| 31 | #define SO_TYPE 0x1008 | 31 | #define SO_TYPE 0x1008 |
| 32 | #define SO_PROTOCOL 0x1028 | ||
| 33 | #define SO_DOMAIN 0x1029 | ||
| 34 | |||
| 32 | 35 | ||
| 33 | /* Linux specific, keep the same. */ | 36 | /* Linux specific, keep the same. */ |
| 34 | #define SO_NO_CHECK 0x000b | 37 | #define SO_NO_CHECK 0x000b |