From 925a4123fd3acb442a88fa6ffb77c0c8a31d392e Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Mon, 9 Aug 2010 16:37:16 -0700 Subject: [PATCH] --- yaml --- r: 208361 b: refs/heads/master c: 72d2e9f9f90ccafdce1f0a4a9eaabfb031f86def h: refs/heads/master i: 208359: b4e7bf557f889c0751bdaf6eb9fa3a5b8923d094 v: v3 --- [refs] | 2 +- trunk/include/linux/i2c.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 3b15a9f5deb8..8a1321bcec1d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0caa621065b2cc05d4e53655a34fd989f500b040 +refs/heads/master: 72d2e9f9f90ccafdce1f0a4a9eaabfb031f86def diff --git a/trunk/include/linux/i2c.h b/trunk/include/linux/i2c.h index 21067b418536..38dd4025aa4e 100644 --- a/trunk/include/linux/i2c.h +++ b/trunk/include/linux/i2c.h @@ -108,6 +108,7 @@ extern s32 i2c_smbus_write_i2c_block_data(struct i2c_client *client, * @shutdown: Callback for device shutdown * @suspend: Callback for device suspend * @resume: Callback for device resume + * @alert: Alert callback, for example for the SMBus alert protocol * @command: Callback for bus-wide signaling (optional) * @driver: Device driver model driver * @id_table: List of I2C devices supported by this driver @@ -233,6 +234,7 @@ static inline void i2c_set_clientdata(struct i2c_client *dev, void *data) * @addr: stored in i2c_client.addr * @platform_data: stored in i2c_client.dev.platform_data * @archdata: copied into i2c_client.dev.archdata + * @of_node: pointer to OpenFirmware device node * @irq: stored in i2c_client.irq * * I2C doesn't actually support hardware probing, although controllers and