diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-12-09 02:24:25 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-12-09 02:24:57 -0500 |
| commit | 4c68db38c85188824b21698842b42a62b4f78657 (patch) | |
| tree | 3ee1c3b22af6713adf669a3bb452ce82bc7fe495 /arch/mn10300/include/asm/socket.h | |
| parent | 5c0e9f28da84c68ce0ae68b7a75faaf862e156e2 (diff) | |
| parent | 2b876f95d03e226394b5d360c86127cbefaf614b (diff) | |
Merge branch 'linus' into x86/urgent
Merge reason: We want to queue up a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/mn10300/include/asm/socket.h')
| -rw-r--r-- | arch/mn10300/include/asm/socket.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/mn10300/include/asm/socket.h b/arch/mn10300/include/asm/socket.h index 4df75af29d76..4e60c4281288 100644 --- a/arch/mn10300/include/asm/socket.h +++ b/arch/mn10300/include/asm/socket.h | |||
| @@ -60,4 +60,6 @@ | |||
| 60 | #define SO_PROTOCOL 38 | 60 | #define SO_PROTOCOL 38 |
| 61 | #define SO_DOMAIN 39 | 61 | #define SO_DOMAIN 39 |
| 62 | 62 | ||
| 63 | #define SO_RXQ_OVFL 40 | ||
| 64 | |||
| 63 | #endif /* _ASM_SOCKET_H */ | 65 | #endif /* _ASM_SOCKET_H */ |