diff options
| author | Mark Brown <[email protected]> | 2015-03-10 10:37:02 +0000 |
|---|---|---|
| committer | Mark Brown <[email protected]> | 2015-03-10 10:37:02 +0000 |
| commit | eb5bc2a213f96bd43b5f00a625acb0c669613645 (patch) | |
| tree | 6093a86c9e704ebfed54adb426ff3079a428da93 /Documentation/i2c/functionality | |
| parent | 485372dc24ca2eaac18ce41a51b9dd017bc11400 (diff) | |
| parent | 9eccca0843205f87c00404b663188b88eb248051 (diff) | |
Merge tag 'v4.0-rc3' into asoc-rt5670
Linux 4.0-rc3
Conflicts:
sound/soc/codecs/rt5670.c
Diffstat (limited to 'Documentation/i2c/functionality')
| -rw-r--r-- | Documentation/i2c/functionality | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/i2c/functionality b/Documentation/i2c/functionality index 4556a3eb87c4..4aae8ed15873 100644 --- a/Documentation/i2c/functionality +++ b/Documentation/i2c/functionality @@ -12,7 +12,7 @@ FUNCTIONALITY CONSTANTS ----------------------- For the most up-to-date list of functionality constants, please check -<linux/i2c.h>! +<uapi/linux/i2c.h>! I2C_FUNC_I2C Plain i2c-level commands (Pure SMBus adapters typically can not do these) |