diff options
| author |   David S. Miller <davem@davemloft.net> | 2009-03-27 17:19:16 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-27 17:19:16 -0700 |
| commit | a83398570e17af6bb81eb94f4f5dd356bd2828d8 (patch) | |
| tree | 5b5c7c3a56898485479291b7c964a1f3887d469c /arch/m68k/include/asm/socket.h | |
| parent | sparc64: Fix MM refcount check in smp_flush_tlb_pending(). (diff) | |
| parent | i915: fix wrong 'size_t' format string (diff) | |
| download | linux-dev-a83398570e17af6bb81eb94f4f5dd356bd2828d8.tar.xz linux-dev-a83398570e17af6bb81eb94f4f5dd356bd2828d8.zip | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/m68k/include/asm/socket.h')
| -rw-r--r-- | arch/m68k/include/asm/socket.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/m68k/include/asm/socket.h b/arch/m68k/include/asm/socket.h index dbc64e92c41a..ca87f938b03f 100644 --- a/arch/m68k/include/asm/socket.h +++ b/arch/m68k/include/asm/socket.h @@ -54,4 +54,7 @@ #define SO_MARK 36 +#define SO_TIMESTAMPING 37 +#define SCM_TIMESTAMPING SO_TIMESTAMPING + #endif /* _ASM_SOCKET_H */ |