diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-17 09:53:59 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-17 09:53:59 -0800 |
| commit | 444a034d390da1b636bb2c5f02ebaa08cdbe8de1 (patch) | |
| tree | beb5a20ae5d5b5dbe7f2d47891d7cd95664f85af /drivers/i2c/busses/i2c-designware-core.h | |
| parent | 6adfd6aceba0b315406b56a48733610aa24c70f8 (diff) | |
| parent | 12688dc21f71f4dcc9e2b8b5556b0c6cc8df1491 (diff) | |
| download | linux-444a034d390da1b636bb2c5f02ebaa08cdbe8de1.tar.bz2 | |
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fix from Wolfram Sang:
"I2C has a revert to fix a regression"
* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
Revert "i2c: designware: detect when dynamic tar update is possible"
Diffstat (limited to 'drivers/i2c/busses/i2c-designware-core.h')
| -rw-r--r-- | drivers/i2c/busses/i2c-designware-core.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-designware-core.h b/drivers/i2c/busses/i2c-designware-core.h index 26250b425e2f..c1db3a5a340f 100644 --- a/drivers/i2c/busses/i2c-designware-core.h +++ b/drivers/i2c/busses/i2c-designware-core.h @@ -125,7 +125,6 @@ struct dw_i2c_dev { int (*acquire_lock)(struct dw_i2c_dev *dev); void (*release_lock)(struct dw_i2c_dev *dev); bool pm_runtime_disabled; - bool dynamic_tar_update_enabled; }; #define ACCESS_SWAP 0x00000001 |