aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa6588.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2006-01-07 03:50:18 -0500
committerLen Brown <len.brown@intel.com>2006-01-07 03:50:18 -0500
commited03f430cdc8c802652467e9097606fedc2c7abc (patch)
tree30941ec1e6f93e99358fefe18175e5dd800a4379 /drivers/media/video/saa6588.c
parented349a8a0a780ed27e2a765f16cee54d9b63bfee (diff)
parent6f957eaf79356a32e838f5f262ee9a60544b1d5b (diff)
Pull pnpacpi into acpica branch
Diffstat (limited to 'drivers/media/video/saa6588.c')
-rw-r--r--drivers/media/video/saa6588.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/media/video/saa6588.c b/drivers/media/video/saa6588.c
index dca3ddfd510f..d60a783e0473 100644
--- a/drivers/media/video/saa6588.c
+++ b/drivers/media/video/saa6588.c
@@ -422,7 +422,6 @@ static int saa6588_attach(struct i2c_adapter *adap, int addr, int kind)
422 s->timer.function = saa6588_timer; 422 s->timer.function = saa6588_timer;
423 s->timer.data = (unsigned long)s; 423 s->timer.data = (unsigned long)s;
424 schedule_work(&s->work); 424 schedule_work(&s->work);
425
426 return 0; 425 return 0;
427} 426}
428 427
@@ -496,10 +495,10 @@ static int saa6588_command(struct i2c_client *client, unsigned int cmd,
496/* ----------------------------------------------------------------------- */ 495/* ----------------------------------------------------------------------- */
497 496
498static struct i2c_driver driver = { 497static struct i2c_driver driver = {
499 .owner = THIS_MODULE, 498 .driver = {
500 .name = "i2c saa6588 driver", 499 .name = "i2c saa6588 driver",
500 },
501 .id = -1, /* FIXME */ 501 .id = -1, /* FIXME */
502 .flags = I2C_DF_NOTIFY,
503 .attach_adapter = saa6588_probe, 502 .attach_adapter = saa6588_probe,
504 .detach_client = saa6588_detach, 503 .detach_client = saa6588_detach,
505 .command = saa6588_command, 504 .command = saa6588_command,
@@ -507,7 +506,6 @@ static struct i2c_driver driver = {
507 506
508static struct i2c_client client_template = { 507static struct i2c_client client_template = {
509 .name = "saa6588", 508 .name = "saa6588",
510 .flags = I2C_CLIENT_ALLOW_USE,
511 .driver = &driver, 509 .driver = &driver,
512}; 510};
513 511