diff options
| author | Tony Lindgren <tony@atomide.com> | 2018-08-28 12:58:03 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2018-08-28 12:58:03 -0400 |
| commit | ea4d65f14f6aaa53e379b93c5544245ef081b3e7 (patch) | |
| tree | a15485f4f1cf547a52b31fa8e16e14b9579b7200 /include/uapi/asm-generic/socket.h | |
| parent | ce32d59ee2cd036f6e8a6ed17a06a0b0bec5c67c (diff) | |
| parent | 496f3347d834aec91c38b45d6249ed00f58ad233 (diff) | |
Merge branch 'perm-fix' into omap-for-v4.19/fixes-v2
Diffstat (limited to 'include/uapi/asm-generic/socket.h')
| -rw-r--r-- | include/uapi/asm-generic/socket.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/uapi/asm-generic/socket.h b/include/uapi/asm-generic/socket.h index 0ae758c90e54..a12692e5f7a8 100644 --- a/include/uapi/asm-generic/socket.h +++ b/include/uapi/asm-generic/socket.h | |||
| @@ -107,4 +107,7 @@ | |||
| 107 | 107 | ||
| 108 | #define SO_ZEROCOPY 60 | 108 | #define SO_ZEROCOPY 60 |
| 109 | 109 | ||
| 110 | #define SO_TXTIME 61 | ||
| 111 | #define SCM_TXTIME SO_TXTIME | ||
| 112 | |||
| 110 | #endif /* __ASM_GENERIC_SOCKET_H */ | 113 | #endif /* __ASM_GENERIC_SOCKET_H */ |