aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/bt832.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-12-12 22:03:53 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-12-12 22:03:53 -0500
commit9da305eb089c94c535d1790fd2dec16f44c1689f (patch)
treef37f07f148fd7a793233c7f15c0fa9f46212049d /drivers/media/video/bt832.c
parentd96212ed87d032d2d830e265aae14038dc1f8ad8 (diff)
parent14ee0a1414536d27bc29373bf23c106b8ef8ce0b (diff)
Merge branch 'master'
Diffstat (limited to 'drivers/media/video/bt832.c')
-rw-r--r--drivers/media/video/bt832.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/media/video/bt832.c b/drivers/media/video/bt832.c
index e4063950ae57..3ca1d768bfd3 100644
--- a/drivers/media/video/bt832.c
+++ b/drivers/media/video/bt832.c
@@ -231,18 +231,18 @@ bt832_command(struct i2c_client *client, unsigned int cmd, void *arg)
231 231
232static struct i2c_driver driver = { 232static struct i2c_driver driver = {
233 .owner = THIS_MODULE, 233 .owner = THIS_MODULE,
234 .name = "i2c bt832 driver", 234 .name = "i2c bt832 driver",
235 .id = -1, /* FIXME */ 235 .id = -1, /* FIXME */
236 .flags = I2C_DF_NOTIFY, 236 .flags = I2C_DF_NOTIFY,
237 .attach_adapter = bt832_probe, 237 .attach_adapter = bt832_probe,
238 .detach_client = bt832_detach, 238 .detach_client = bt832_detach,
239 .command = bt832_command, 239 .command = bt832_command,
240}; 240};
241static struct i2c_client client_template = 241static struct i2c_client client_template =
242{ 242{
243 .name = "bt832", 243 .name = "bt832",
244 .flags = I2C_CLIENT_ALLOW_USE, 244 .flags = I2C_CLIENT_ALLOW_USE,
245 .driver = &driver, 245 .driver = &driver,
246}; 246};
247 247
248 248