diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-15 04:29:06 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-15 04:29:06 -0500 |
| commit | 709334c87dbdb44150ce436b3d13c814db0dcae9 (patch) | |
| tree | 5861a45f70c1f283720337abd864498f5afb3dbe /include/asm-generic/socket.h | |
| parent | 0d64b568fcd48b133721c1d322e7c51d85eb12df (diff) | |
| parent | f74890277a196949e4004fe2955e1d4fb3930f98 (diff) | |
Merge branch 'fixes' of git://git.alsa-project.org/alsa-kernel into for-linus
Diffstat (limited to 'include/asm-generic/socket.h')
| -rw-r--r-- | include/asm-generic/socket.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-generic/socket.h b/include/asm-generic/socket.h index 538991cef6f0..9a6115e7cf63 100644 --- a/include/asm-generic/socket.h +++ b/include/asm-generic/socket.h | |||
| @@ -63,4 +63,5 @@ | |||
| 63 | #define SO_PROTOCOL 38 | 63 | #define SO_PROTOCOL 38 |
| 64 | #define SO_DOMAIN 39 | 64 | #define SO_DOMAIN 39 |
| 65 | 65 | ||
| 66 | #define SO_RXQ_OVFL 40 | ||
| 66 | #endif /* __ASM_GENERIC_SOCKET_H */ | 67 | #endif /* __ASM_GENERIC_SOCKET_H */ |