diff options
| author | Richard Weinberger <richard@nod.at> | 2017-12-16 11:01:00 +0100 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2017-12-16 11:01:00 +0100 |
| commit | 9ec4c8e810588ddf6a4a2ebd501cf6cc18c97ad0 (patch) | |
| tree | 9a32fd384351923fd01dc852fb88ef044bcac748 | |
| parent | bc2fd1b11097ad981478abcc0328784ea131ac29 (diff) | |
| parent | 10a6a6975691775bbcc677a04c6fd3120b5c1160 (diff) | |
| download | linux-9ec4c8e810588ddf6a4a2ebd501cf6cc18c97ad0.tar.bz2 | |
Merge branch 'spi-nor/fixes' of ssh://bombadil/srv/git/linux-mtd into mtd/fixes-for-4.15-rc4
| -rw-r--r-- | Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt b/Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt index 376fa2f50e6b..956bb046e599 100644 --- 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 |