diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-03-26 11:18:44 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-03-26 11:19:03 -0400 |
| commit | 7fd52392c56361a40f0c630a82b36b95ca31eac6 (patch) | |
| tree | 14091de24c6b28ea4cae9826f98aeedb7be091f5 /arch/mn10300/include/asm/socket.h | |
| parent | b01c3a0010aabadf745f3e7fdb9cab682e0a28a2 (diff) | |
| parent | e22057c8599373e5caef0bc42bdb95d2a361ab0d (diff) | |
Merge branch 'linus' into perf/urgent
Merge reason: we need to fix a non-trivial merge conflict.
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 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/mn10300/include/asm/socket.h b/arch/mn10300/include/asm/socket.h index 876356d78522..820463a484b8 100644 --- a/arch/mn10300/include/asm/socket.h +++ b/arch/mn10300/include/asm/socket.h | |||
| @@ -64,5 +64,9 @@ | |||
| 64 | 64 | ||
| 65 | #define SO_WIFI_STATUS 41 | 65 | #define SO_WIFI_STATUS 41 |
| 66 | #define SCM_WIFI_STATUS SO_WIFI_STATUS | 66 | #define SCM_WIFI_STATUS SO_WIFI_STATUS |
| 67 | #define SO_PEEK_OFF 42 | ||
| 68 | |||
| 69 | /* Instruct lower device to use last 4-bytes of skb data as FCS */ | ||
| 70 | #define SO_NOFCS 43 | ||
| 67 | 71 | ||
| 68 | #endif /* _ASM_SOCKET_H */ | 72 | #endif /* _ASM_SOCKET_H */ |