diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-12 21:19:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-12 21:19:23 -0700 |
| commit | a0486407bea3f0545ee3fcfb768b6763c5c2b459 (patch) | |
| tree | df25e25f6c5c0c3d8db2c42835174cc081af71a5 /include | |
| parent | 2513eb8e67a2483aecb5bf7fead7692d5aabbdcd (diff) | |
| parent | 5cab828bf0f52f3697a61aa99c54ee43844f53c0 (diff) | |
| download | op-kernel-dev-a0486407bea3f0545ee3fcfb768b6763c5c2b459.zip op-kernel-dev-a0486407bea3f0545ee3fcfb768b6763c5c2b459.tar.gz | |
Merge commit master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6 of HEAD
* HEAD:
[PATCH] hwmon: Documentation update for abituguru
[PATCH] hwmon: Fix for first generation Abit uGuru chips
[PATCH] hwmon: New maintainer for w83791d
[PATCH] pca9539: Honor the force parameter
[PATCH] i2c-algo-bit: Wipe out dead code
[PATCH] i2c: Handle i2c_add_adapter failure in i2c algorithm drivers
[PATCH] i2c: New mailing list
[PATCH] i2c-ite: Plan for removal
[PATCH] i2c-powermac: Fix master_xfer return value
[PATCH] scx200_acb: Fix the block transactions
[PATCH] scx200_acb: Fix the state machine
[PATCH] i2c-iop3xx: Avoid addressing self
[PATCH] i2c: Fix 'ignore' module parameter handling in i2c-core
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/i2c.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/i2c.h b/include/linux/i2c.h index 526ddc8..eb0628a 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h @@ -193,6 +193,8 @@ struct i2c_algorithm { to NULL. If an adapter algorithm can do SMBus access, set smbus_xfer. If set to NULL, the SMBus protocol is simulated using common I2C messages */ + /* master_xfer should return the number of messages successfully + processed, or a negative value on error */ int (*master_xfer)(struct i2c_adapter *adap,struct i2c_msg *msgs, int num); int (*smbus_xfer) (struct i2c_adapter *adap, u16 addr, |
