Land b_head_libcfs onto HEAD (20080805_1722)

[fs/lustre-release.git] / libcfs / include / libcfs / linux / linux-tcpip.h

diff --git a/libcfs/include/libcfs/linux/linux-tcpip.h b/libcfs/include/libcfs/linux/linux-tcpip.h
index ef36a45..45a5563 100644 (file)
--- a/libcfs/include/libcfs/linux/linux-tcpip.h
+++ b/libcfs/include/libcfs/linux/linux-tcpip.h
@@ -45,7 +45,10 @@
 #error Do not #include this file directly. #include <libcfs/libcfs.h> instead
 #endif
 
-#ifdef __KERNEL__
+#ifndef __KERNEL__
+#error This include is only for kernel use.
+#endif
+
 #include <net/sock.h>
 
 typedef struct socket   cfs_socket_t;
@@ -73,10 +76,4 @@ typedef struct socket   cfs_socket_t;
 #define SOCK_ERROR(so)          ((so)->sk->sk_err)
 #define SOCK_TEST_NOSPACE(so)   test_bit(SOCK_NOSPACE, &(so)->flags)
 
-#else   /* !__KERNEL__ */
-
-#include "../user-tcpip.h"
-
-#endif /* __KERNEL__ */
-
 #endif