diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-03-04 01:55:20 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-03-04 01:55:20 +0300 |
| commit | 58bdf601c2de6071d0386a7a6fa707bd04761c47 (patch) | |
| tree | 68ea7e26bca786b88f023d0adce030c767875af1 /Documentation | |
| parent | 20f14172cbb8d711a47d336355fa947631444f60 (diff) | |
| parent | 7c4246797b84e55e2dfaaf8a18033de9df7c18c1 (diff) | |
| download | linux-58bdf601c2de6071d0386a7a6fa707bd04761c47.tar.xz | |
Merge branch 'i2c/for-current-fixed' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang:
"A driver fix and a documentation fix (which makes dependency handling
for the next cycle easier)"
* 'i2c/for-current-fixed' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: octeon: Prevent error message on bus error
dt-bindings: at24: sort manufacturers alphabetically
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/eeprom/at24.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/eeprom/at24.txt b/Documentation/devicetree/bindings/eeprom/at24.txt index 1812c848e369..abfae1beca2b 100644 --- a/Documentation/devicetree/bindings/eeprom/at24.txt +++ b/Documentation/devicetree/bindings/eeprom/at24.txt @@ -38,9 +38,9 @@ Required properties: "catalyst", "microchip", + "nxp", "ramtron", "renesas", - "nxp", "st", Some vendors use different model names for chips which are just |