LU-13274 uapi: make lnet UAPI headers C99 compliant

[fs/lustre-release.git] / libcfs / include / libcfs / util / ioctl.h

diff --git a/libcfs/include/libcfs/util/ioctl.h b/libcfs/include/libcfs/util/ioctl.h
index eddd4f1..f93ed87 100644 (file)
--- a/libcfs/include/libcfs/util/ioctl.h
+++ b/libcfs/include/libcfs/util/ioctl.h
@@ -23,7 +23,7 @@
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2014, Intel Corporation.
+ * Copyright (c) 2014, 2017, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -43,7 +43,7 @@
 /* Sparse annotation. */
 #define __user
 
-#include <uapi/linux/lnet/libcfs_ioctl.h>
+#include <linux/lnet/libcfs_ioctl.h>
 
 #define LIBCFS_IOC_INIT(data)                                  \
 do {                                                           \
@@ -62,7 +62,7 @@ do {                                                  \
 /* FIXME - rename these to libcfs_ */
 int libcfs_ioctl_pack(struct libcfs_ioctl_data *data, char **pbuf, int max);
 void libcfs_ioctl_unpack(struct libcfs_ioctl_data *data, char *pbuf);
-int register_ioc_dev(int dev_id, const char *dev_name, int major, int minor);
+int register_ioc_dev(int dev_id, const char *dev_name);
 void unregister_ioc_dev(int dev_id);
 int l_ioctl(int dev_id, unsigned int opc, void *buf);
 #endif