diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-04-27 14:16:19 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-04-27 14:16:19 -0400 |
| commit | d1da4e50e5d09f02c340927a4fcb7f54202fa033 (patch) | |
| tree | 7f98317bdd45dbdb7644e9179891c5af6a3a8ef1 /include/asm-xtensa/socket.h | |
| parent | 78ab67da1002d954ea4c3e2b441e2483c41f94e8 (diff) | |
| parent | a205752d1ad2d37d6597aaae5a56fc396a770868 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/mtd/Kconfig
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'include/asm-xtensa/socket.h')
| -rw-r--r-- | include/asm-xtensa/socket.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-xtensa/socket.h b/include/asm-xtensa/socket.h index 971d231be60e..1f5aeacb9da2 100644 --- a/include/asm-xtensa/socket.h +++ b/include/asm-xtensa/socket.h | |||
| @@ -60,5 +60,7 @@ | |||
| 60 | #define SO_ACCEPTCONN 30 | 60 | #define SO_ACCEPTCONN 30 |
| 61 | #define SO_PEERSEC 31 | 61 | #define SO_PEERSEC 31 |
| 62 | #define SO_PASSSEC 34 | 62 | #define SO_PASSSEC 34 |
| 63 | #define SO_TIMESTAMPNS 35 | ||
| 64 | #define SCM_TIMESTAMPNS SO_TIMESTAMPNS | ||
| 63 | 65 | ||
| 64 | #endif /* _XTENSA_SOCKET_H */ | 66 | #endif /* _XTENSA_SOCKET_H */ |