[PATCH] fix tuner.c and tda9887.c in 2.5.69-mm6

Shane Shrybman (shrybman@sympatico.ca)
17 May 2003 10:20:06 -0400


This is a MIME-formatted message. If you see this text it means that your
E-mail software does not support MIME-formatted messages.

--=_courier-23094-1053181393-0001-2
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: 7bit

Hi,

Attached are two patches that make bttv compile and work in 2.5.69-mm6.
I think this broke in -mm4. The patches are probably not correct, but
they work for me.

Regards,

Shane

--=_courier-23094-1053181393-0001-2
Content-Type: text/x-diff; name="2.5.69-mm6.tda9887.diff"; charset=iso-8859-1
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename=2.5.69-mm6.tda9887.diff

--- linux-2.5.69-mm6/drivers/media/video/tda9887.c.orig Sat May 17 09:20:35 2003
+++ linux-2.5.69-mm6/drivers/media/video/tda9887.c Sat May 17 09:49:01 2003
@@ -439,9 +439,11 @@
};
static struct i2c_client client_template =
{
- .dev.name = "tda9887",
- .flags = I2C_CLIENT_ALLOW_USE,
- .driver = &driver,
+ .flags = I2C_CLIENT_ALLOW_USE,
+ .driver = &driver,
+ .dev = {
+ .name = "tda9887",
+ },
};

static int tda9887_init_module(void)

--=_courier-23094-1053181393-0001-2
Content-Type: text/x-diff; name="2.5.69-mm6.tuner.diff"; charset=iso-8859-1
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename=2.5.69-mm6.tuner.diff

--- linux-2.5.69-mm6/drivers/media/video/tuner.c.orig Fri May 16 20:38:34 2003
+++ linux-2.5.69-mm6/drivers/media/video/tuner.c Sat May 17 09:46:53 2003
@@ -960,9 +960,11 @@
};
static struct i2c_client client_template =
{
- .dev.name = "(tuner unset)",
- .flags = I2C_CLIENT_ALLOW_USE,
- .driver = &driver,
+ .flags = I2C_CLIENT_ALLOW_USE,
+ .driver = &driver,
+ .dev = {
+ .name = "(tuner unset)",
+ },
};

static int tuner_init_module(void)

--=_courier-23094-1053181393-0001-2--