diff options
author | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-06 07:31:02 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-06 07:31:02 (GMT) |
commit | 8566cfc9fe0934f52ddedc12b083176116c13978 (patch) | |
tree | b0f92fd0982a4dabaa2c108f4f1d130d2cff6798 /drivers/media/video/msp3400.c | |
parent | 7bdb2b6aca356c765bb697a4e9e7599357ee1542 (diff) | |
parent | 77ae84554cc0178e03862391599a0cedf96fa4c4 (diff) | |
download | linux-fsl-qoriq-8566cfc9fe0934f52ddedc12b083176116c13978.tar.xz |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6
Diffstat (limited to 'drivers/media/video/msp3400.c')
-rw-r--r-- | drivers/media/video/msp3400.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/msp3400.c b/drivers/media/video/msp3400.c index e956234..ca02f6f 100644 --- a/drivers/media/video/msp3400.c +++ b/drivers/media/video/msp3400.c @@ -1437,7 +1437,7 @@ static struct i2c_driver driver = { static struct i2c_client client_template = { - I2C_DEVNAME("(unset)"), + .name = "(unset)", .flags = I2C_CLIENT_ALLOW_USE, .driver = &driver, }; @@ -1509,7 +1509,7 @@ static int msp_attach(struct i2c_adapter *adap, int addr, int kind) } /* hello world :-) */ - printk(KERN_INFO "msp34xx: init: chip=%s",i2c_clientname(c)); + printk(KERN_INFO "msp34xx: init: chip=%s", c->name); if (HAVE_NICAM(msp)) printk(" +nicam"); if (HAVE_SIMPLE(msp)) |