diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-03-31 15:15:47 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-03-31 15:15:47 +1000 |
| commit | 5fc0df93fccd4dc8412bfc488ba4ba8268aa12dc (patch) | |
| tree | 6091ced63dbba747619762470ebba2298676ea0d /include/linux/i2c.h | |
| parent | 700d6ab987f3b5e28b13b5993e5a9a975c5604e2 (diff) | |
| parent | 7111951b8d4973bda27ff663f2cf18b663d15b48 (diff) | |
| download | kernel_replicant_linux-5fc0df93fccd4dc8412bfc488ba4ba8268aa12dc.tar.gz kernel_replicant_linux-5fc0df93fccd4dc8412bfc488ba4ba8268aa12dc.tar.bz2 kernel_replicant_linux-5fc0df93fccd4dc8412bfc488ba4ba8268aa12dc.zip | |
Merge v5.6 into drm-next
msm needed rc6, so I just went and merged release
(msm has been in drm-next outside of this tree)
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include/linux/i2c.h')
| -rw-r--r-- | include/linux/i2c.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/i2c.h b/include/linux/i2c.h index f834687989f7..f6b942150631 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h @@ -506,7 +506,7 @@ i2c_register_board_info(int busnum, struct i2c_board_info const *info, * @smbus_xfer_atomic: same as @smbus_xfer. Yet, only using atomic context * so e.g. PMICs can be accessed very late before shutdown. Optional. * @functionality: Return the flags that this algorithm/adapter pair supports - * from the I2C_FUNC_* flags. + * from the ``I2C_FUNC_*`` flags. * @reg_slave: Register given client to I2C slave mode of this adapter * @unreg_slave: Unregister given client from I2C slave mode of this adapter * @@ -515,7 +515,7 @@ i2c_register_board_info(int busnum, struct i2c_board_info const *info, * be addressed using the same bus algorithms - i.e. bit-banging or the PCF8584 * to name two of the most common. * - * The return codes from the @master_xfer{_atomic} fields should indicate the + * The return codes from the ``master_xfer{_atomic}`` fields should indicate the * type of error code that occurred during the transfer, as documented in the * Kernel Documentation file Documentation/i2c/fault-codes.rst. */ |