Merge branch 'spi-nor/fixes' of ssh://bombadil/srv/git/linux-mtd into…

… mtd/fixes-for-4.15-rc4
mariux64 · Dec 16, 2017 · 9ec4c8e · 9ec4c8e
2 parents bc2fd1b + 10a6a69
commit 9ec4c8e
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt b/Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt
@@ -13,7 +13,6 @@ Required properties:
                  at25df321a
                  at25df641
                  at26df081a
-                 en25s64
                  mr25h128
                  mr25h256
                  mr25h10
@@ -33,7 +32,6 @@ Required properties:
                  s25fl008k
                  s25fl064k
                  sst25vf040b
-                 sst25wf040b
                  m25p40
                  m25p80
                  m25p16