summaryrefslogtreecommitdiff
path: root/include/uapi/linux/input.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/uapi/linux/input.h')
-rw-r--r--include/uapi/linux/input.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/include/uapi/linux/input.h b/include/uapi/linux/input.h
index a3726275876d..ba88cecb29aa 100644
--- a/include/uapi/linux/input.h
+++ b/include/uapi/linux/input.h
@@ -5,16 +5,14 @@
* under the terms of the GNU General Public License version 2 as published by
* the Free Software Foundation.
*/
-#ifndef _UAPI_INPUT_H
-#define _UAPI_INPUT_H
+#ifndef _INPUT_H
+#define _INPUT_H
-#ifndef __KERNEL__
#include <sys/time.h>
#include <sys/ioctl.h>
#include <sys/types.h>
#include <linux/types.h>
-#endif
/*
@@ -1073,7 +1071,7 @@ struct ff_periodic_effect {
struct ff_envelope envelope;
__u32 custom_len;
- __s16 __user *custom_data;
+ __s16 *custom_data;
};
/**
@@ -1168,4 +1166,4 @@ struct ff_effect {
#define FF_MAX 0x7f
#define FF_CNT (FF_MAX+1)
-#endif /* _UAPI_INPUT_H */
+#endif /* _INPUT_H */