diff options
| author | Wolfram Sang <wsa@the-dreams.de> | 2018-03-02 11:04:33 +0100 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2018-03-02 11:04:33 +0100 |
| commit | 1a0e3a35c651b56db59a28b5f693cdf9d4582b56 (patch) | |
| tree | b9aff4ceb273234419492567f45e7bbe9f2fb33e | |
| parent | Linux 4.16-rc3 (diff) | |
| parent | dt-bindings: at24: sort manufacturers alphabetically (diff) | |
| download | linux-1a0e3a35c651b56db59a28b5f693cdf9d4582b56.tar.xz linux-1a0e3a35c651b56db59a28b5f693cdf9d4582b56.zip | |
Merge tag 'at24-4.16-rc4-for-wolfram' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into i2c/for-current
Pull in this fixup to get rid of a dependency for the next cycle:
"- sort the manufacturers in DT bindings alphabetically"
| -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 |