diff options
| author | David S. Miller <davem@davemloft.net> | 2018-09-05 00:33:03 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-09-05 00:33:03 -0400 |
| commit | 36302685f59345959de96d0d70a5ad20a3a3451b (patch) | |
| tree | 778b3170acd1131840823520a4664f2bba343dbe /include/linux/i2c.h | |
| parent | 2fc4aa59ab470f1d5124b33c05680e2b2f2c6f65 (diff) | |
| parent | 28619527b8a712590c93d0a9e24b4425b9376a8c (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'include/linux/i2c.h')
| -rw-r--r-- | include/linux/i2c.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/i2c.h b/include/linux/i2c.h index b79387fd57da..65b4eaed1d96 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h | |||
| @@ -855,7 +855,7 @@ static inline u8 i2c_8bit_addr_from_msg(const struct i2c_msg *msg) | |||
| 855 | } | 855 | } |
| 856 | 856 | ||
| 857 | u8 *i2c_get_dma_safe_msg_buf(struct i2c_msg *msg, unsigned int threshold); | 857 | u8 *i2c_get_dma_safe_msg_buf(struct i2c_msg *msg, unsigned int threshold); |
| 858 | void i2c_release_dma_safe_msg_buf(struct i2c_msg *msg, u8 *buf); | 858 | void i2c_put_dma_safe_msg_buf(u8 *buf, struct i2c_msg *msg, bool xferred); |
| 859 | 859 | ||
| 860 | int i2c_handle_smbus_host_notify(struct i2c_adapter *adap, unsigned short addr); | 860 | int i2c_handle_smbus_host_notify(struct i2c_adapter *adap, unsigned short addr); |
| 861 | /** | 861 | /** |