diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-09-14 20:26:05 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-09-14 20:26:05 +0200 |
| commit | ac8d513a6801c8636922ccf4f30211810c9a56ce (patch) | |
| tree | 83ba584487a6a612c8fcf2563c28c0263df35ba2 /include/asm-generic/socket.h | |
| parent | bf992fa2bc1ad1bb2aeb0bdfadb43f236b9297fd (diff) | |
| parent | 99bc47067910f7070e65ee318a6dd79a2371f1e5 (diff) | |
| download | op-kernel-dev-ac8d513a6801c8636922ccf4f30211810c9a56ce.zip op-kernel-dev-ac8d513a6801c8636922ccf4f30211810c9a56ce.tar.gz | |
Merge branch 'master' into for-linus
Diffstat (limited to 'include/asm-generic/socket.h')
| -rw-r--r-- | include/asm-generic/socket.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-generic/socket.h b/include/asm-generic/socket.h index 5d79e40..538991c 100644 --- a/include/asm-generic/socket.h +++ b/include/asm-generic/socket.h @@ -60,4 +60,7 @@ #define SO_TIMESTAMPING 37 #define SCM_TIMESTAMPING SO_TIMESTAMPING +#define SO_PROTOCOL 38 +#define SO_DOMAIN 39 + #endif /* __ASM_GENERIC_SOCKET_H */ |
