diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-01-31 09:13:14 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-01-31 09:13:14 -0500 |
| commit | ea51e5040e24eefe44d70bc654a237ca1f0225b0 (patch) | |
| tree | df2e5922dcdfafae62a10d8cd97f98121064fc23 /include/asm-generic/socket.h | |
| parent | 3422a47041b8cb8f14ac1e3926bcf711121df6dc (diff) | |
| parent | 8dbd52daee38adaae4d5a674bcca837e694a4f4c (diff) | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'include/asm-generic/socket.h')
| -rw-r--r-- | include/asm-generic/socket.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-generic/socket.h b/include/asm-generic/socket.h index 9a6115e7cf63..49c1704173e7 100644 --- a/include/asm-generic/socket.h +++ b/include/asm-generic/socket.h | |||
| @@ -64,4 +64,7 @@ | |||
| 64 | #define SO_DOMAIN 39 | 64 | #define SO_DOMAIN 39 |
| 65 | 65 | ||
| 66 | #define SO_RXQ_OVFL 40 | 66 | #define SO_RXQ_OVFL 40 |
| 67 | |||
| 68 | #define SO_WIFI_STATUS 41 | ||
| 69 | #define SCM_WIFI_STATUS SO_WIFI_STATUS | ||
| 67 | #endif /* __ASM_GENERIC_SOCKET_H */ | 70 | #endif /* __ASM_GENERIC_SOCKET_H */ |