From: Andrew Walrond <andrew@walrond.org>
Date: Mon, 02 Feb 2009 21:13:11 +0000
To a certain extent they are supposed to be able to
co-exist.
We weren't careful in the past in some cases, to the point
where the conflicts often very difficult to resolve. That's
the kind of situation we have here.
I guess I'll put in the following hack for now:
diff --git a/include/linux/if_tunnel.h b/include/linux/if_tunnel.h
index aeab2cb..82c4362 100644
--- a/include/linux/if_tunnel.h
+++ b/include/linux/if_tunnel.h
@@ -2,7 +2,10 @@
#define _IF_TUNNEL_H_
#include <linux/types.h>
+
+#ifdef __KERNEL__
#include <linux/ip.h>
+#endif
#define SIOCGETTUNNEL (SIOCDEVPRIVATE + 0)
#define SIOCADDTUNNEL (SIOCDEVPRIVATE + 1)
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html