Attachment #84570 for bug #127122

Lines 1-10 Link Here

(-)lirc-0.8.0/drivers/kcompat.h (-1 / +12 lines)
1	/* $Id: kcompat.h,v 5.24 2006/01/07 20:51:31 lirc Exp $ */	1	/* $Id: kcompat.h,v 5.26 2006/03/04 23:16:02 lirc Exp $ */
2		2
3	#ifndef _KCOMPAT_H	3	#ifndef _KCOMPAT_H
4	#define _KCOMPAT_H	4	#define _KCOMPAT_H
5		5
6	#include <linux/version.h>	6	#include <linux/version.h>
7		7
		8	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
		9	#define LIRC_THIS_MODULE(x) x,
		10	#else /* >= 2.6.16 */
		11	#define LIRC_THIS_MODULE(x)
		12	#endif
		13
8	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)	14	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
9		15
10	#include <linux/device.h>	16	#include <linux/device.h>
Lines 245-250 Link Here
245	# define I2C_ALGO_BIT 0	251	# define I2C_ALGO_BIT 0
246	#endif	252	#endif
247		253
		254	/* removed in 2.6.16 */
		255	#ifndef I2C_DRIVERID_EXP3
		256	# define I2C_DRIVERID_EXP3 0xf003
		257	#endif
		258
248	/************************* USB specific ***************************/	259	/************************* USB specific ***************************/
249	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 0)	260	#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 0)
250	#include <linux/usb.h>	261	#include <linux/usb.h>

Lines 1180-1186 Link Here

(-)lirc-0.8.0/drivers/lirc_atiusb/lirc_atiusb.c (-1 / +1 lines)
1180	}	1180	}
1181		1181
1182	static struct usb_driver usb_remote_driver = {	1182	static struct usb_driver usb_remote_driver = {
1183	.owner = THIS_MODULE,	1183	LIRC_THIS_MODULE(.owner = THIS_MODULE)
1184	.name = DRIVER_NAME,	1184	.name = DRIVER_NAME,
1185	.probe = usb_remote_probe,	1185	.probe = usb_remote_probe,
1186	.disconnect = usb_remote_disconnect,	1186	.disconnect = usb_remote_disconnect,

Lines 1-4 Link Here

(-)lirc-0.8.0/drivers/lirc_i2c/lirc_i2c.c (-2 / +9 lines)
1	/* $Id: lirc_i2c.c,v 1.35 2005/10/20 18:25:58 lirc Exp $ */	1	/* $Id: lirc_i2c.c,v 1.36 2006/03/04 23:16:03 lirc Exp $ */
2		2
3	/*	3	/*
4	* i2c IR lirc plugin for Hauppauge and Pixelview cards - new 2.3.x i2c stack	4	* i2c IR lirc plugin for Hauppauge and Pixelview cards - new 2.3.x i2c stack
Lines 360-368 Link Here
360	static int ir_command(struct i2c_client client, unsigned int cmd, void arg);	360	static int ir_command(struct i2c_client client, unsigned int cmd, void arg);
361		361
362	static struct i2c_driver driver = {	362	static struct i2c_driver driver = {
		363	#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 16)
363	name: "i2c ir driver",	364	name: "i2c ir driver",
364	id: I2C_DRIVERID_EXP3, /* FIXME */
365	flags: I2C_DF_NOTIFY,	365	flags: I2C_DF_NOTIFY,
		366	#else
		367	.driver = {
		368	owner: THIS_MODULE,
		369	name: "i2c ir driver",
		370	},
		371	#endif
		372	id: I2C_DRIVERID_EXP3, /* FIXME */
366	attach_adapter: ir_probe,	373	attach_adapter: ir_probe,
367	detach_client: ir_detach,	374	detach_client: ir_detach,
368	command: ir_command,	375	command: ir_command,

Lines 615-621 Link Here

(-)lirc-0.8.0/drivers/lirc_igorplugusb/lirc_igorplugusb.c (-1 / +1 lines)
615	};	615	};
616		616
617	static struct usb_driver usb_remote_driver = {	617	static struct usb_driver usb_remote_driver = {
618	.owner = THIS_MODULE,	618	LIRC_THIS_MODULE(.owner = THIS_MODULE)
619	.name = DRIVER_NAME,	619	.name = DRIVER_NAME,
620	.probe = usb_remote_probe,	620	.probe = usb_remote_probe,
621	.disconnect = usb_remote_disconnect,	621	.disconnect = usb_remote_disconnect,

Lines 201-207 Link Here

(-)lirc-0.8.0/drivers/lirc_imon/lirc_imon.c (-1 / +1 lines)
201		201
202	/* USB Device data */	202	/* USB Device data */
203	static struct usb_driver imon_driver = {	203	static struct usb_driver imon_driver = {
204	.owner = THIS_MODULE,	204	LIRC_THIS_MODULE(.owner = THIS_MODULE)
205	.name = MOD_NAME,	205	.name = MOD_NAME,
206	.probe = imon_probe,	206	.probe = imon_probe,
207	.disconnect = imon_disconnect,	207	.disconnect = imon_disconnect,

Lines 222-228 Link Here

(-)lirc-0.8.0/drivers/lirc_mceusb/lirc_mceusb.c (-1 / +1 lines)
222		222
223	/* usb specific object needed to register this driver with the usb subsystem */	223	/* usb specific object needed to register this driver with the usb subsystem */
224	static struct usb_driver mceusb_driver = {	224	static struct usb_driver mceusb_driver = {
225	.owner = THIS_MODULE,	225	LIRC_THIS_MODULE(.owner = THIS_MODULE)
226	.name = DRIVER_NAME,	226	.name = DRIVER_NAME,
227	.probe = mceusb_probe,	227	.probe = mceusb_probe,
228	.disconnect = mceusb_disconnect,	228	.disconnect = mceusb_disconnect,

Lines 585-591 Link Here

(-)lirc-0.8.0/drivers/lirc_mceusb2/lirc_mceusb2.c (-1 / +1 lines)
585	}	585	}
586		586
587	static struct usb_driver usb_remote_driver = {	587	static struct usb_driver usb_remote_driver = {
588	.owner = THIS_MODULE,	588	LIRC_THIS_MODULE(.owner = THIS_MODULE)
589	.name = DRIVER_NAME,	589	.name = DRIVER_NAME,
590	.probe = usb_remote_probe,	590	.probe = usb_remote_probe,
591	.disconnect = usb_remote_disconnect,	591	.disconnect = usb_remote_disconnect,

Lines 189-195 Link Here

(-)lirc-0.8.0/drivers/lirc_sasem/lirc_sasem.c (-1 / +1 lines)
189		189
190	/* USB Device data */	190	/* USB Device data */
191	static struct usb_driver sasem_driver = {	191	static struct usb_driver sasem_driver = {
192	.owner = THIS_MODULE,	192	LIRC_THIS_MODULE(.owner = THIS_MODULE)
193	.name = MOD_NAME,	193	.name = MOD_NAME,
194	.probe = sasem_probe,	194	.probe = sasem_probe,
195	.disconnect = sasem_disconnect,	195	.disconnect = sasem_disconnect,

Lines 177-183 Link Here

(-)lirc-0.8.0/drivers/lirc_streamzap/lirc_streamzap.c (-1 / +1 lines)
177	/* usb specific object needed to register this driver with the usb subsystem */	177	/* usb specific object needed to register this driver with the usb subsystem */
178		178
179	static struct usb_driver streamzap_driver = {	179	static struct usb_driver streamzap_driver = {
180	.owner = THIS_MODULE,	180	LIRC_THIS_MODULE(.owner = THIS_MODULE)
181	.name = DRIVER_NAME,	181	.name = DRIVER_NAME,
182	.probe = streamzap_probe,	182	.probe = streamzap_probe,
183	.disconnect = streamzap_disconnect,	183	.disconnect = streamzap_disconnect,

Return to bug 127122