From 096166622785876bd4360f2cdb1495665ca03c6c Mon Sep 17 00:00:00 2001 From: Michael Hunold Date: Thu, 9 Jan 2003 10:27:22 +0000 Subject: Fixes for 2.5.55 all over the place: - removed the patches, they are not needed any more. you can now use a vanilla 2.5.55 kernel - created a new backport for video-buf and videodev from the 2.5.55 sources - necessary fixes to the saa7146 driver due to changes in 2.5.55 - the core budget functions are now provided by a module called "budget-core.o". (otherwise static compilation is not possible...) - removed #ifdef MODULE crap from all files Misc. - "xawtv" (using xv extension) resulted in wrong colors. the problem is within "xawtv". Gerd Knorr told me, that it'll be fixed in the next release. I tested this version with 2.4.20, 2.5.55 (modules) and 2.5.55 (static). --- linux/drivers/media/video/saa7111.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'linux/drivers/media/video/saa7111.c') diff --git a/linux/drivers/media/video/saa7111.c b/linux/drivers/media/video/saa7111.c index 461e797cc..7dc3bae14 100644 --- a/linux/drivers/media/video/saa7111.c +++ b/linux/drivers/media/video/saa7111.c @@ -57,8 +57,6 @@ struct saa7111 { int sat; }; -/* hmm, the saa7111(a) specs don't say anything about address 34>>1 (= 17 = 0x11), - only for 0x24 and 0x25 ... */ static unsigned short normal_i2c[] = { 0x24, 0x25, I2C_CLIENT_END }; static unsigned short normal_i2c_range[] = { I2C_CLIENT_END }; @@ -205,17 +203,6 @@ static int saa7111_command(struct i2c_client *client, unsigned int cmd, cap->outputs = 1; } break; - case DECODER_INIT: - { - int i = 0; - struct video_decoder_init *init = arg; - i = i2c_master_send(client, init->data, init->count); - if (i < 0) { - return -EFAULT; - } else { - } - } - break; case DECODER_GET_STATUS: { int *iarg = arg; @@ -401,6 +388,9 @@ static int saa7111_command(struct i2c_client *client, unsigned int cmd, /* ----------------------------------------------------------------------- */ static struct i2c_driver i2c_driver_saa7111 = { +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,54) + .owner = THIS_MODULE, +#endif .name = "saa7111", /* name */ .id = I2C_DRIVERID_SAA7111A, /* ID */ .flags = I2C_DF_NOTIFY, -- cgit v1.2.3