projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'irq-fix' of git://www.modarm9.com/gitsrc/pub/people/ukleinek/linux...
[firefly-linux-kernel-4.4.55.git]
/
include
/
linux
/
joystick.h
diff --git
a/include/linux/joystick.h
b/include/linux/joystick.h
index 06b9af77eb7f8eca71b6476013ea69ed32ee909e..e2d3a18af4566a9cd7dd4e1f123162d894031832 100644
(file)
--- a/
include/linux/joystick.h
+++ b/
include/linux/joystick.h
@@
-134,6
+134,7
@@
struct JS_DATA_SAVE_TYPE_64 {
struct JS_DATA_TYPE JS_CORR;
};
+#ifdef __KERNEL__
#if BITS_PER_LONG == 64
#define JS_DATA_SAVE_TYPE JS_DATA_SAVE_TYPE_64
#elif BITS_PER_LONG == 32
@@
-141,5
+142,6
@@
struct JS_DATA_SAVE_TYPE_64 {
#else
#error Unexpected BITS_PER_LONG
#endif
+#endif
#endif /* _LINUX_JOYSTICK_H */