patch-2.2.18 linux/include/linux/joystick.h

Next file: linux/include/linux/kbd_kern.h
Previous file: linux/include/linux/ixjuser.h
Back to the patch index
Back to the overall index

diff -u --new-file --recursive --exclude-from /usr/src/exclude v2.2.17/include/linux/joystick.h linux/include/linux/joystick.h
@@ -134,18 +134,14 @@
 #error "You need to use at least v2.2 Linux kernel."
 #endif
 
+#include <linux/spinlock.h>
+
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0)
-#include <asm/spinlock.h>
-typedef struct wait_queue *wait_queue_head_t;
-#define __setup(a,b)
+#define __exit
 #define BASE_ADDRESS(x,i)	((x)->base_address[i])
-#define DECLARE_WAITQUEUE(x,y)	struct wait_queue x = { y, NULL }
-#define init_waitqueue_head(x)	do { *(x) = NULL; } while (0)
-#define __set_current_state(x)	current->state = x
-#define SETUP_PARAM		char *str, int *ints
-#define SETUP_PARSE(x)		do {} while (0)
+#define SETUP_PARAM		char *str
+#define SETUP_PARSE(x)		int ints[x]; get_options(str, ints)
 #else
-#include <linux/spinlock.h>
 #define BASE_ADDRESS(x,i)	((x)->resource[i].start)
 #define SETUP_PARAM		char *str
 #define SETUP_PARSE(x)		int ints[x]; get_options(str, x, ints)

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)