diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-08-26 03:49:51 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-08-26 03:49:51 -0400 |
| commit | 2d0b579a9831c927bcebf5f61055e7462f0af2dc (patch) | |
| tree | 3181c183b463e745601b1f4efda0f8fff3f1c08b /drivers/hwmon/pmbus/pmbus.h | |
| parent | e80ca144ea902efa7aed446780fd9fad421fd8d3 (diff) | |
| parent | 671ee7f0ce62e4b991b47fcf1c161c3f710dabbc (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into sh-fixes-for-linus
Diffstat (limited to 'drivers/hwmon/pmbus/pmbus.h')
| -rw-r--r-- | drivers/hwmon/pmbus/pmbus.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hwmon/pmbus/pmbus.h b/drivers/hwmon/pmbus/pmbus.h index 0808d986d75b..a6ae20ffef6b 100644 --- a/drivers/hwmon/pmbus/pmbus.h +++ b/drivers/hwmon/pmbus/pmbus.h | |||
| @@ -325,6 +325,7 @@ struct pmbus_driver_info { | |||
| 325 | int (*read_word_data)(struct i2c_client *client, int page, int reg); | 325 | int (*read_word_data)(struct i2c_client *client, int page, int reg); |
| 326 | int (*write_word_data)(struct i2c_client *client, int page, int reg, | 326 | int (*write_word_data)(struct i2c_client *client, int page, int reg, |
| 327 | u16 word); | 327 | u16 word); |
| 328 | int (*write_byte)(struct i2c_client *client, int page, u8 value); | ||
| 328 | /* | 329 | /* |
| 329 | * The identify function determines supported PMBus functionality. | 330 | * The identify function determines supported PMBus functionality. |
| 330 | * This function is only necessary if a chip driver supports multiple | 331 | * This function is only necessary if a chip driver supports multiple |