diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-30 17:53:32 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-30 17:53:32 -0400 |
| commit | 65fb0d23fcddd8697c871047b700c78817bdaa43 (patch) | |
| tree | 119e6e5f276622c4c862f6c9b6d795264ba1603a /include/asm-m32r | |
| parent | 8c083f081d0014057901c68a0a3e0f8ca7ac8d23 (diff) | |
| parent | dfbbe89e197a77f2c8046a51c74e33e35f878080 (diff) | |
Merge branch 'linus' into cpumask-for-linus
Conflicts:
arch/x86/kernel/cpu/common.c
Diffstat (limited to 'include/asm-m32r')
| -rw-r--r-- | include/asm-m32r/socket.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-m32r/socket.h b/include/asm-m32r/socket.h index 9a0e20012224..be7ed589af5c 100644 --- a/include/asm-m32r/socket.h +++ b/include/asm-m32r/socket.h | |||
| @@ -54,4 +54,7 @@ | |||
| 54 | 54 | ||
| 55 | #define SO_MARK 36 | 55 | #define SO_MARK 36 |
| 56 | 56 | ||
| 57 | #define SO_TIMESTAMPING 37 | ||
| 58 | #define SCM_TIMESTAMPING SO_TIMESTAMPING | ||
| 59 | |||
| 57 | #endif /* _ASM_M32R_SOCKET_H */ | 60 | #endif /* _ASM_M32R_SOCKET_H */ |