diff options
author | Jody McIntyre <scjody@modernduck.com> | 2005-12-12 23:58:44 -0500 |
---|---|---|
committer | Jody McIntyre <scjody@modernduck.com> | 2005-12-12 23:58:44 -0500 |
commit | 25d3f1622fdbc73db3f6860961b5fb3035a39f32 (patch) | |
tree | f4eef88bc0083f282c64c14e81c0ecc95e5f2b43 /drivers/media/video/saa7134/saa7134-i2c.c | |
parent | dc3edd5412341b02d84144ddfd5bf6ccaaeeb1ac (diff) | |
parent | 0e670506668a43e1355b8f10c33d081a676bd521 (diff) |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-i2c.c')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-i2c.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/saa7134/saa7134-i2c.c b/drivers/media/video/saa7134/saa7134-i2c.c index 7575043f087..df9dd36721e 100644 --- a/drivers/media/video/saa7134/saa7134-i2c.c +++ b/drivers/media/video/saa7134/saa7134-i2c.c @@ -333,7 +333,7 @@ static int attach_inform(struct i2c_client *client) struct tuner_setup tun_setup; d1printk( "%s i2c attach [addr=0x%x,client=%s]\n", - client->driver->name, client->addr, client->name); + client->driver->name, client->addr, client->name); /* Am I an i2c remote control? */ |