Gentoo Attachment #84452 for bug #124301

View | Details | Raw Unified
Collapse All | Expand All

(-) linux-2.6.16/include/linux/uinput.h.orig (-28 / +38 lines)

Lines 13-24	Link Here

#include <linux/time.h>

#include <linux/time.h>

#include <linux/list.h>

#include <linux/list.h>

#include <linux/device.h>

#include <linux/device.h>

#include <linux/mod_devicetable.h>

#else

#else

#include <sys/time.h>

#include <sys/time.h>

#include <sys/ioctl.h>

#include <sys/ioctl.h>

#include <asm/types.h>

#include <asm/types.h>

#endif

#endif

#include <linux/mod_devicetable.h>

/*

/*

 * The event structure itself

 * The event structure itself

Lines 41-53 struct input_event {	Link Here

 * IOCTLs (0x00 - 0x7f)

 * IOCTLs (0x00 - 0x7f)

*/

*/

struct input_id {

	__u16 bustype;

	__u16 vendor;

	__u16 product;

	__u16 version;

};

struct input_absinfo {

struct input_absinfo {

	__s32 value;

	__s32 value;

	__s32 minimum;

	__s32 minimum;

Lines 796-820 struct ff_effect {	Link Here

#define FF_MAX		0x7f

#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.

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

*/

*/

Lines 249-252 struct i2c_device_id {	Link Here

	__u16 id;

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

#endif /* LINUX_MOD_DEVICETABLE_H */

Lines 39-44	Link Here

#include <linux/vt_kern.h>

#include <linux/vt_kern.h>

#include <linux/sysrq.h>

#include <linux/sysrq.h>

#include <linux/input.h>

#include <linux/input.h>

#include <linux/mod_devicetable.h>

static void kbd_disconnect(struct input_handle *handle);

static void kbd_disconnect(struct input_handle *handle);

extern void ctrl_alt_del(void);

extern void ctrl_alt_del(void);

Lines 26-31	Link Here

#include <linux/init.h>

#include <linux/init.h>

#include <linux/smp_lock.h>

#include <linux/smp_lock.h>

#include <linux/device.h>

#include <linux/device.h>

#include <linux/mod_devicetable.h>

MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");

MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");

MODULE_DESCRIPTION("Joystick device interfaces");

MODULE_DESCRIPTION("Joystick device interfaces");

Lines 35-40	Link Here

#include <linux/tty.h>

#include <linux/tty.h>

#include <linux/delay.h>

#include <linux/delay.h>

#include <linux/pm.h>

#include <linux/pm.h>

#include <linux/mod_devicetable.h>

static struct input_handler power_handler;

static struct input_handler power_handler;

Lines 21-26	Link Here

#include <linux/smp_lock.h>

#include <linux/smp_lock.h>

#include <linux/device.h>

#include <linux/device.h>

#include <linux/compat.h>

#include <linux/compat.h>

#include <linux/mod_devicetable.h>

struct evdev {

struct evdev {

	int exist;

	int exist;

Lines 21-26	Link Here

#include <linux/interrupt.h>

#include <linux/interrupt.h>

#include <linux/poll.h>

#include <linux/poll.h>

#include <linux/device.h>

#include <linux/device.h>

#include <linux/mod_devicetable.h>

MODULE_AUTHOR("Vojtech Pavlik <vojtech@suse.cz>");

MODULE_AUTHOR("Vojtech Pavlik <vojtech@suse.cz>");

MODULE_DESCRIPTION("Input core");

MODULE_DESCRIPTION("Input core");

Lines 33-38	Link Here

#include <linux/input.h>

#include <linux/input.h>

#include <linux/init.h>

#include <linux/init.h>

#include <linux/device.h>

#include <linux/device.h>

#include <linux/mod_devicetable.h>

MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");

MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");

MODULE_DESCRIPTION("Input driver event debug module");

MODULE_DESCRIPTION("Input driver event debug module");

Lines 24-29	Link Here

#include <linux/random.h>

#include <linux/random.h>

#include <linux/major.h>

#include <linux/major.h>

#include <linux/device.h>

#include <linux/device.h>

#include <linux/mod_devicetable.h>

#ifdef CONFIG_INPUT_MOUSEDEV_PSAUX

#ifdef CONFIG_INPUT_MOUSEDEV_PSAUX

#include <linux/miscdevice.h>

#include <linux/miscdevice.h>

#endif

#endif

Lines 53-58	Link Here

#include <linux/random.h>

#include <linux/random.h>

#include <linux/time.h>

#include <linux/time.h>

#include <linux/device.h>

#include <linux/device.h>

#include <linux/mod_devicetable.h>

#ifndef CONFIG_INPUT_TSDEV_SCREEN_X

#ifndef CONFIG_INPUT_TSDEV_SCREEN_X

#define CONFIG_INPUT_TSDEV_SCREEN_X	240

#define CONFIG_INPUT_TSDEV_SCREEN_X	240

Lines 10-16	Link Here

*/

*/

#include <linux/usb.h>

#include <linux/usb.h>

#include <linux/input.h>

#include <linux/mod_devicetable.h>

#include <asm/byteorder.h>

#include <asm/byteorder.h>

static inline void

static inline void

Lines 28-33	Link Here

 *	0.1	20/06/2002

 *	0.1	20/06/2002

 *		- first public version

 *		- first public version

*/

*/

#include <linux/mod_devicetable.h>

#ifdef __KERNEL__

#ifdef __KERNEL__

#define UINPUT_MINOR		223

#define UINPUT_MINOR		223

#define UINPUT_NAME		"uinput"

#define UINPUT_NAME		"uinput"

Attachment #84452: incomplete patch for bug #124301