diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-30 05:04:53 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-30 05:04:53 +0200 |
| commit | 9ff9a26b786c35ee8d2a66222924a807ec851a9f (patch) | |
| tree | db432a17bccca1ca2c16907f0ee83ac449ed4012 /arch/s390/include/asm/socket.h | |
| parent | Merge commit 'kumar/next' into next (diff) | |
| parent | Merge branch 'bzip2-lzma-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| download | linux-9ff9a26b786c35ee8d2a66222924a807ec851a9f.tar.xz linux-9ff9a26b786c35ee8d2a66222924a807ec851a9f.zip | |
Merge commit 'origin/master' into next
Manual merge of:
arch/powerpc/include/asm/elf.h
drivers/i2c/busses/i2c-mpc.c
Diffstat (limited to 'arch/s390/include/asm/socket.h')
| -rw-r--r-- | arch/s390/include/asm/socket.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/s390/include/asm/socket.h b/arch/s390/include/asm/socket.h index c786ab623b2d..02330c50241b 100644 --- a/arch/s390/include/asm/socket.h +++ b/arch/s390/include/asm/socket.h @@ -62,4 +62,7 @@ #define SO_MARK 36 +#define SO_TIMESTAMPING 37 +#define SCM_TIMESTAMPING SO_TIMESTAMPING + #endif /* _ASM_SOCKET_H */ |