diff options
| author | Wolfram Sang <wsa@the-dreams.de> | 2018-03-24 13:39:18 +0100 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2018-03-24 13:39:18 +0100 |
| commit | 0b884c22c5b7f6ef985b3d39fed06ad1f8296042 (patch) | |
| tree | 74504e80ad62cb0acabdfa796348d001d5d1a2a4 /drivers/i2c/busses/i2c-octeon-core.h | |
| parent | eb49778c8c6cbe075cf90d741ccf16f674a8db4e (diff) | |
| parent | 84e10623c0b9c81557918804f309d66aec86a233 (diff) | |
| download | linux-0b884c22c5b7f6ef985b3d39fed06ad1f8296042.tar.gz linux-0b884c22c5b7f6ef985b3d39fed06ad1f8296042.tar.xz | |
Merge tag 'at24-4.17-updates-for-wolfram' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into i2c/for-4.17
"three new special cases for device tree compatible strings"
Diffstat (limited to 'drivers/i2c/busses/i2c-octeon-core.h')
| -rw-r--r-- | drivers/i2c/busses/i2c-octeon-core.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-octeon-core.h b/drivers/i2c/busses/i2c-octeon-core.h index a7ef19855bb8..9bb9f64fdda0 100644 --- a/drivers/i2c/busses/i2c-octeon-core.h +++ b/drivers/i2c/busses/i2c-octeon-core.h @@ -43,7 +43,7 @@ #define TWSI_CTL_AAK 0x04 /* Assert ACK */ /* Status values */ -#define STAT_ERROR 0x00 +#define STAT_BUS_ERROR 0x00 #define STAT_START 0x08 #define STAT_REP_START 0x10 #define STAT_TXADDR_ACK 0x18 |