- merge 2 weeks of b1_4 fixes onto HEAD

[fs/lustre-release.git] / lnet / include / lnet / api-support.h

diff --git a/lnet/include/lnet/api-support.h b/lnet/include/lnet/api-support.h
index cfae78c..c5994c6 100644 (file)
--- a/lnet/include/lnet/api-support.h
+++ b/lnet/include/lnet/api-support.h
@@ -19,9 +19,4 @@
 
 #include <portals/internal.h>
 #include <portals/nal.h>
-#include <portals/arg-blocks.h>
 
-/* Hack for 2.4.18 macro name collision */
-#ifdef yield
-#undef yield
-#endif