Commit d1d3c2f7 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] fix tuner.c and tda9887.c

From: Shane Shrybman <shrybman@sympatico.ca>

Attached are two patches that make bttv compile and work in 2.5.69-mm6.  I
think this broke in -mm4.
parent d5b973d7
...@@ -439,9 +439,11 @@ static struct i2c_driver driver = { ...@@ -439,9 +439,11 @@ static struct i2c_driver driver = {
}; };
static struct i2c_client client_template = static struct i2c_client client_template =
{ {
.dev.name = "tda9887",
.flags = I2C_CLIENT_ALLOW_USE, .flags = I2C_CLIENT_ALLOW_USE,
.driver = &driver, .driver = &driver,
.dev = {
.name = "tda9887",
},
}; };
static int tda9887_init_module(void) static int tda9887_init_module(void)
......
...@@ -960,9 +960,11 @@ static struct i2c_driver driver = { ...@@ -960,9 +960,11 @@ static struct i2c_driver driver = {
}; };
static struct i2c_client client_template = static struct i2c_client client_template =
{ {
.dev.name = "(tuner unset)",
.flags = I2C_CLIENT_ALLOW_USE, .flags = I2C_CLIENT_ALLOW_USE,
.driver = &driver, .driver = &driver,
.dev = {
.name = "(tuner unset)",
},
}; };
static int tuner_init_module(void) static int tuner_init_module(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment