diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-09 16:31:56 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-09 16:31:56 -0400 |
| commit | 6a4690c22f5da1eb1c898b61b6a80da52fbd976f (patch) | |
| tree | a03891a32abe0da191fb765fe669a597e07423c6 /include/linux/i2c.h | |
| parent | 90bb28b0644f7324f8bd1feb27b35146e6785ba2 (diff) | |
| parent | 8ec53663d2698076468b3e1edc4e1b418bd54de3 (diff) | |
Merge branch 'ptebits' into devel
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'include/linux/i2c.h')
| -rw-r--r-- | include/linux/i2c.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/linux/i2c.h b/include/linux/i2c.h index 08be0d21864c..06115128047f 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h | |||
| @@ -97,7 +97,19 @@ extern s32 i2c_smbus_write_i2c_block_data(struct i2c_client * client, | |||
| 97 | 97 | ||
| 98 | /** | 98 | /** |
| 99 | * struct i2c_driver - represent an I2C device driver | 99 | * struct i2c_driver - represent an I2C device driver |
| 100 | * @id: Unique driver ID (optional) | ||
| 100 | * @class: What kind of i2c device we instantiate (for detect) | 101 | * @class: What kind of i2c device we instantiate (for detect) |
| 102 | * @attach_adapter: Callback for bus addition (for legacy drivers) | ||
| 103 | * @detach_adapter: Callback for bus removal (for legacy drivers) | ||
| 104 | * @detach_client: Callback for device removal (for legacy drivers) | ||
| 105 | * @probe: Callback for device binding (new-style drivers) | ||
| 106 | * @remove: Callback for device unbinding (new-style drivers) | ||
| 107 | * @shutdown: Callback for device shutdown | ||
| 108 | * @suspend: Callback for device suspend | ||
| 109 | * @resume: Callback for device resume | ||
| 110 | * @command: Callback for bus-wide signaling (optional) | ||
| 111 | * @driver: Device driver model driver | ||
| 112 | * @id_table: List of I2C devices supported by this driver | ||
| 101 | * @detect: Callback for device detection | 113 | * @detect: Callback for device detection |
| 102 | * @address_data: The I2C addresses to probe, ignore or force (for detect) | 114 | * @address_data: The I2C addresses to probe, ignore or force (for detect) |
| 103 | * @clients: List of detected clients we created (for i2c-core use only) | 115 | * @clients: List of detected clients we created (for i2c-core use only) |