Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f647e08a authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

[PATCH] joystick-vs-x.org fix 

Fix http://bugzilla.kernel.org/show_bug.cgi?id=5241



2.6.13 broke compilation of the xorg tree, which apprarently insists on
including that file.

Cc: Vojtech Pavlik <vojtech@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a464adeb

include/linux/joystick.h

+13 −11
Original line number Diff line number Diff line
@@ -111,29 +111,30 @@ struct js_corr { 
#define JS_SET_ALL		8



struct JS_DATA_TYPE {

	__s32 buttons;

	__s32 x;

	__s32 y;

	int32_t buttons;

	int32_t x;

	int32_t y;

};



struct JS_DATA_SAVE_TYPE_32 {

	__s32 JS_TIMEOUT;

	__s32 BUSY;

	__s32 JS_EXPIRETIME;

	__s32 JS_TIMELIMIT;

	int32_t JS_TIMEOUT;

	int32_t BUSY;

	int32_t JS_EXPIRETIME;

	int32_t JS_TIMELIMIT;

	struct JS_DATA_TYPE JS_SAVE;

	struct JS_DATA_TYPE JS_CORR;

};



struct JS_DATA_SAVE_TYPE_64 {

	__s32 JS_TIMEOUT;

	__s32 BUSY;

	__s64 JS_EXPIRETIME;

	__s64 JS_TIMELIMIT;

	int32_t JS_TIMEOUT;

	int32_t BUSY;

	int64_t JS_EXPIRETIME;

	int64_t JS_TIMELIMIT;

	struct JS_DATA_TYPE JS_SAVE;

	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 */