Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 3 insertions, 1 deletions

diff --git a/include/linux/socket.h b/include/linux/socket.h
index 92cd38efad7f..fcd35a210e7f 100644
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -187,7 +187,8 @@ struct ucred {
 #define AF_LLC          26      /* Linux LLC                    */
 #define AF_TIPC         30      /* TIPC sockets                 */
 #define AF_BLUETOOTH    31      /* Bluetooth sockets            */
-#define AF_MAX          32      /* For now.. */
+#define AF_IUCV         32      /* IUCV sockets                 */
+#define AF_MAX          33      /* For now.. */
 
 /* Protocol families, same as address families. */
 #define PF_UNSPEC       AF_UNSPEC
@@ -220,6 +221,7 @@ struct ucred {
 #define PF_LLC          AF_LLC
 #define PF_TIPC         AF_TIPC
 #define PF_BLUETOOTH    AF_BLUETOOTH
+#define PF_IUCV         AF_IUCV
 #define PF_MAX          AF_MAX
 
 /* Maximum queue length specifiable by listen.  */