git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
[safe/jmp/linux-2.6]
/
arch
/
avr32
/
include
/
asm
/
socket.h
diff --git
a/arch/avr32/include/asm/socket.h
b/arch/avr32/include/asm/socket.h
index
04c8606
..
fe863f9
100644
(file)
--- a/
arch/avr32/include/asm/socket.h
+++ b/
arch/avr32/include/asm/socket.h
@@
-57,4
+57,7
@@
#define SO_TIMESTAMPING 37
#define SCM_TIMESTAMPING SO_TIMESTAMPING
+#define SO_PROTOCOL 38
+#define SO_DOMAIN 39
+
#endif /* __ASM_AVR32_SOCKET_H */