X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libcfs%2Finclude%2Flibcfs%2Futil%2Fioctl.h;h=a59e2c97ba2ff2ea72ed045e63ff54ec47abdc32;hb=HEAD;hp=a42e0c5fe4568a708de5ee91a32474fe1c6c190f;hpb=ccabce23bd9e366c345c852f565766a799f61238;p=fs%2Flustre-release.git

diff --git a/libcfs/include/libcfs/util/ioctl.h b/libcfs/include/libcfs/util/ioctl.h
index a42e0c5..c99fda6 100644
--- a/libcfs/include/libcfs/util/ioctl.h
+++ b/libcfs/include/libcfs/util/ioctl.h
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
  *
  * libcfs/include/libcfs/util/ioctl.h
  *
@@ -43,19 +42,19 @@
 /* Sparse annotation. */
 #define __user
 
-#include <uapi/linux/lnet/libcfs_ioctl.h>
+#include <linux/lnet/libcfs_ioctl.h>
 
 #define LIBCFS_IOC_INIT(data)					\
 do {								\
 	memset(&(data), 0, sizeof(data));			\
-	(data).ioc_hdr.ioc_version = LIBCFS_IOCTL_VERSION;	\
+	(data).ioc_hdr.ioc_version = LNET_IOCTL_VERSION;	\
 	(data).ioc_hdr.ioc_len = sizeof(data);			\
 } while (0)
 
 #define LIBCFS_IOC_INIT_V2(data, hdr)			\
 do {							\
 	memset(&(data), 0, sizeof(data));		\
-	(data).hdr.ioc_version = LIBCFS_IOCTL_VERSION2;	\
+	(data).hdr.ioc_version = LNET_IOCTL_VERSION2;	\
 	(data).hdr.ioc_len = sizeof(data);		\
 } while (0)