From 17cb894b07e74e9d2b10a45d4fcf6cba8df41a49 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Wed, 24 Aug 2011 18:45:14 +0000
Subject: [PATCH] --- yaml --- r: 265544 b: refs/heads/master c:
 3828620bc0c2d055c3e66c075de4c2a609baec26 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/include/linux/tipc_config.h | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index dc16f6dcc90d..4c23837349c9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7ff30c43f316f1febcfb6e84d511ab34ea433e7b
+refs/heads/master: 3828620bc0c2d055c3e66c075de4c2a609baec26
diff --git a/trunk/include/linux/tipc_config.h b/trunk/include/linux/tipc_config.h
index 0db239590b4d..9730b0e51e46 100644
--- a/trunk/include/linux/tipc_config.h
+++ b/trunk/include/linux/tipc_config.h
@@ -41,6 +41,10 @@
 #include <linux/string.h>
 #include <asm/byteorder.h>
 
+#ifndef __KERNEL__
+#include <arpa/inet.h> /* for ntohs etc. */
+#endif
+
 /*
  * Configuration
  *