Attachment #84452 for bug #124301




#include <linux/time.h>
#include <linux/list.h>
#include <linux/device.h>
#include <linux/mod_devicetable.h>
#else
#include <sys/time.h>
#include <sys/ioctl.h>
#include <asm/types.h>
#endif
#include <linux/mod_devicetable.h>

/*
 * The event structure itself

 * IOCTLs (0x00 - 0x7f)
 */

struct input_id {
	__u16 bustype;
	__u16 vendor;
	__u16 product;
	__u16 version;
};

struct input_absinfo {
	__s32 value;
	__s32 minimum;


#define FF_MAX		0x7f

struct input_device_id {

	kernel_ulong_t flags;

	struct input_id id;

	kernel_ulong_t evbit[EV_MAX/BITS_PER_LONG+1];
	kernel_ulong_t keybit[KEY_MAX/BITS_PER_LONG+1];
	kernel_ulong_t relbit[REL_MAX/BITS_PER_LONG+1];
	kernel_ulong_t absbit[ABS_MAX/BITS_PER_LONG+1];
	kernel_ulong_t mscbit[MSC_MAX/BITS_PER_LONG+1];
	kernel_ulong_t ledbit[LED_MAX/BITS_PER_LONG+1];
	kernel_ulong_t sndbit[SND_MAX/BITS_PER_LONG+1];
	kernel_ulong_t ffbit[FF_MAX/BITS_PER_LONG+1];
	kernel_ulong_t swbit[SW_MAX/BITS_PER_LONG+1];

	kernel_ulong_t driver_info;
};

/*
 * Structure for hotplug & device<->driver matching.
 */




	__u16 id;
};

/* Input */
struct input_id {
	__u16 bustype;
	__u16 vendor;
	__u16 product;
	__u16 version;
};

struct input_device_id {

	kernel_ulong_t flags;

	struct input_id id;

	kernel_ulong_t evbit[EV_MAX/BITS_PER_LONG+1];
	kernel_ulong_t keybit[KEY_MAX/BITS_PER_LONG+1];
	kernel_ulong_t relbit[REL_MAX/BITS_PER_LONG+1];
	kernel_ulong_t absbit[ABS_MAX/BITS_PER_LONG+1];
	kernel_ulong_t mscbit[MSC_MAX/BITS_PER_LONG+1];
	kernel_ulong_t ledbit[LED_MAX/BITS_PER_LONG+1];
	kernel_ulong_t sndbit[SND_MAX/BITS_PER_LONG+1];
	kernel_ulong_t ffbit[FF_MAX/BITS_PER_LONG+1];
	kernel_ulong_t swbit[SW_MAX/BITS_PER_LONG+1];

	kernel_ulong_t driver_info;
};

#endif /* LINUX_MOD_DEVICETABLE_H */

Lines 39-44 Link Here

(-)linux-2.6.16/drivers/char/keyboard.c.orig (+1 lines)
39	#include <linux/vt_kern.h>	39	#include <linux/vt_kern.h>
40	#include <linux/sysrq.h>	40	#include <linux/sysrq.h>
41	#include <linux/input.h>	41	#include <linux/input.h>
		42	#include <linux/mod_devicetable.h>
42		43
43	static void kbd_disconnect(struct input_handle *handle);	44	static void kbd_disconnect(struct input_handle *handle);
44	extern void ctrl_alt_del(void);	45	extern void ctrl_alt_del(void);

Lines 26-31 Link Here

(-)linux-2.6.16/drivers/input/joydev.c.orig (+1 lines)
26	#include <linux/init.h>	26	#include <linux/init.h>
27	#include <linux/smp_lock.h>	27	#include <linux/smp_lock.h>
28	#include <linux/device.h>	28	#include <linux/device.h>
		29	#include <linux/mod_devicetable.h>
29		30
30	MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");	31	MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
31	MODULE_DESCRIPTION("Joystick device interfaces");	32	MODULE_DESCRIPTION("Joystick device interfaces");

Lines 35-40 Link Here

(-)linux-2.6.16/drivers/input/power.c.orig (+1 lines)
35	#include <linux/tty.h>	35	#include <linux/tty.h>
36	#include <linux/delay.h>	36	#include <linux/delay.h>
37	#include <linux/pm.h>	37	#include <linux/pm.h>
		38	#include <linux/mod_devicetable.h>
38		39
39	static struct input_handler power_handler;	40	static struct input_handler power_handler;
40		41

Lines 21-26 Link Here

(-)linux-2.6.16/drivers/input/evdev.c.orig (+1 lines)
21	#include <linux/smp_lock.h>	21	#include <linux/smp_lock.h>
22	#include <linux/device.h>	22	#include <linux/device.h>
23	#include <linux/compat.h>	23	#include <linux/compat.h>
		24	#include <linux/mod_devicetable.h>
24		25
25	struct evdev {	26	struct evdev {
26	int exist;	27	int exist;

Lines 21-26 Link Here

(-)linux-2.6.16/drivers/input/input.c.orig (+1 lines)
21	#include <linux/interrupt.h>	21	#include <linux/interrupt.h>
22	#include <linux/poll.h>	22	#include <linux/poll.h>
23	#include <linux/device.h>	23	#include <linux/device.h>
		24	#include <linux/mod_devicetable.h>
24		25
25	MODULE_AUTHOR("Vojtech Pavlik <vojtech@suse.cz>");	26	MODULE_AUTHOR("Vojtech Pavlik <vojtech@suse.cz>");
26	MODULE_DESCRIPTION("Input core");	27	MODULE_DESCRIPTION("Input core");

Lines 33-38 Link Here

(-)linux-2.6.16/drivers/input/evbug.c.orig (+1 lines)
33	#include <linux/input.h>	33	#include <linux/input.h>
34	#include <linux/init.h>	34	#include <linux/init.h>
35	#include <linux/device.h>	35	#include <linux/device.h>
		36	#include <linux/mod_devicetable.h>
36		37
37	MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");	38	MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
38	MODULE_DESCRIPTION("Input driver event debug module");	39	MODULE_DESCRIPTION("Input driver event debug module");

Lines 24-29 Link Here

(-)linux-2.6.16/drivers/input/mousedev.c.orig (+1 lines)
24	#include <linux/random.h>	24	#include <linux/random.h>
25	#include <linux/major.h>	25	#include <linux/major.h>
26	#include <linux/device.h>	26	#include <linux/device.h>
		27	#include <linux/mod_devicetable.h>
27	#ifdef CONFIG_INPUT_MOUSEDEV_PSAUX	28	#ifdef CONFIG_INPUT_MOUSEDEV_PSAUX
28	#include <linux/miscdevice.h>	29	#include <linux/miscdevice.h>
29	#endif	30	#endif

Lines 53-58 Link Here

(-)linux-2.6.16/drivers/input/tsdev.c.orig (+1 lines)
53	#include <linux/random.h>	53	#include <linux/random.h>
54	#include <linux/time.h>	54	#include <linux/time.h>
55	#include <linux/device.h>	55	#include <linux/device.h>
		56	#include <linux/mod_devicetable.h>
56		57
57	#ifndef CONFIG_INPUT_TSDEV_SCREEN_X	58	#ifndef CONFIG_INPUT_TSDEV_SCREEN_X
58	#define CONFIG_INPUT_TSDEV_SCREEN_X 240	59	#define CONFIG_INPUT_TSDEV_SCREEN_X 240

Lines 10-16 Link Here

(-)linux-2.6.16/include/linux/usb_input.h.orig (-1 / +1 lines)
10	*/	10	*/
11		11
12	#include <linux/usb.h>	12	#include <linux/usb.h>
13	#include <linux/input.h>	13	#include <linux/mod_devicetable.h>
14	#include <asm/byteorder.h>	14	#include <asm/byteorder.h>
15		15
16	static inline void	16	static inline void

Lines 28-33 Link Here

(-)linux-2.6.16/include/linux/uinput.h.orig (+1 lines)
28	* 0.1 20/06/2002	28	* 0.1 20/06/2002
29	* - first public version	29	* - first public version
30	*/	30	*/
		31	#include <linux/mod_devicetable.h>
31	#ifdef __KERNEL__	32	#ifdef __KERNEL__
32	#define UINPUT_MINOR 223	33	#define UINPUT_MINOR 223
33	#define UINPUT_NAME "uinput"	34	#define UINPUT_NAME "uinput"

Return to bug 124301

Lines 249-252 struct i2c_device_id { Link Here

(-)linux-2.6.16/include/linux/mod_devicetable.h.orig (+27 lines)
249	__u16 id;	249	__u16 id;
250	};	250	};
251		251
		252	/* Input */
		253	struct input_id {
		254	__u16 bustype;
		255	__u16 vendor;
		256	__u16 product;
		257	__u16 version;
		258	};
		259
		260	struct input_device_id {
		261
		262	kernel_ulong_t flags;
		263
		264	struct input_id id;
		265
		266	kernel_ulong_t evbit[EV_MAX/BITS_PER_LONG+1];
		267	kernel_ulong_t keybit[KEY_MAX/BITS_PER_LONG+1];
		268	kernel_ulong_t relbit[REL_MAX/BITS_PER_LONG+1];
		269	kernel_ulong_t absbit[ABS_MAX/BITS_PER_LONG+1];
		270	kernel_ulong_t mscbit[MSC_MAX/BITS_PER_LONG+1];
		271	kernel_ulong_t ledbit[LED_MAX/BITS_PER_LONG+1];
		272	kernel_ulong_t sndbit[SND_MAX/BITS_PER_LONG+1];
		273	kernel_ulong_t ffbit[FF_MAX/BITS_PER_LONG+1];
		274	kernel_ulong_t swbit[SW_MAX/BITS_PER_LONG+1];
		275
		276	kernel_ulong_t driver_info;
		277	};
		278
252	#endif /* LINUX_MOD_DEVICETABLE_H */	279	#endif /* LINUX_MOD_DEVICETABLE_H */

Lines 13-24 Link Here

(-)linux-2.6.16/include/linux/input.h.orig (-27 / +1 lines)
13	#include <linux/time.h>	13	#include <linux/time.h>
14	#include <linux/list.h>	14	#include <linux/list.h>
15	#include <linux/device.h>	15	#include <linux/device.h>
16	#include <linux/mod_devicetable.h>
17	#else	16	#else
18	#include <sys/time.h>	17	#include <sys/time.h>
19	#include <sys/ioctl.h>	18	#include <sys/ioctl.h>
20	#include <asm/types.h>	19	#include <asm/types.h>
21	#endif	20	#endif
		21	#include <linux/mod_devicetable.h>
22		22
23	/*	23	/*
24	* The event structure itself	24	* The event structure itself
Lines 41-53 struct input_event { Link Here
41	* IOCTLs (0x00 - 0x7f)	41	* IOCTLs (0x00 - 0x7f)
42	*/	42	*/
43		43
44	struct input_id {
45	__u16 bustype;
46	__u16 vendor;
47	__u16 product;
48	__u16 version;
49	};
50
51	struct input_absinfo {	44	struct input_absinfo {
52	__s32 value;	45	__s32 value;
53	__s32 minimum;	46	__s32 minimum;
Lines 796-820 struct ff_effect { Link Here
796		789
797	#define FF_MAX 0x7f	790	#define FF_MAX 0x7f
798		791
799	struct input_device_id {
800
801	kernel_ulong_t flags;
802
803	struct input_id id;
804
805	kernel_ulong_t evbit[EV_MAX/BITS_PER_LONG+1];
806	kernel_ulong_t keybit[KEY_MAX/BITS_PER_LONG+1];
807	kernel_ulong_t relbit[REL_MAX/BITS_PER_LONG+1];
808	kernel_ulong_t absbit[ABS_MAX/BITS_PER_LONG+1];
809	kernel_ulong_t mscbit[MSC_MAX/BITS_PER_LONG+1];
810	kernel_ulong_t ledbit[LED_MAX/BITS_PER_LONG+1];
811	kernel_ulong_t sndbit[SND_MAX/BITS_PER_LONG+1];
812	kernel_ulong_t ffbit[FF_MAX/BITS_PER_LONG+1];
813	kernel_ulong_t swbit[SW_MAX/BITS_PER_LONG+1];
814
815	kernel_ulong_t driver_info;
816	};
817
818	/*	792	/*
819	* Structure for hotplug & device<->driver matching.	793	* Structure for hotplug & device<->driver matching.
820	*/	794	*/