diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-23 11:30:52 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-23 11:30:52 +1000 |
commit | f82fe9590d13e92e5e51db2802daf374fcd754b1 (patch) | |
tree | f87a0d2247654a7dd5835aa3f19f6ba89e26f5db /Documentation | |
parent | 9f92f3084b3c90d1bc8d4453c9d6498560b1aa6d (diff) | |
parent | 060991d74f40695f048517755457ff91ae3db048 (diff) |
Merge branch 'quilt/i2c'
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/i2c/instantiating-devices | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/i2c/instantiating-devices b/Documentation/i2c/instantiating-devices index e89490270aba..87da405a8597 100644 --- a/Documentation/i2c/instantiating-devices +++ b/Documentation/i2c/instantiating-devices @@ -102,7 +102,7 @@ static int __devinit usb_hcd_pnx4008_probe(struct platform_device *pdev) memset(&i2c_info, 0, sizeof(struct i2c_board_info)); strlcpy(i2c_info.name, "isp1301_pnx", I2C_NAME_SIZE); isp1301_i2c_client = i2c_new_probed_device(i2c_adap, &i2c_info, - normal_i2c); + normal_i2c, NULL); i2c_put_adapter(i2c_adap); (...) } |