Merge tag 'linux-kselftest-4.14-rc1-update' of git://git.kernel.org/pub/scm/linux...

[sfrench/cifs-2.6.git] / Documentation / devicetree / bindings / spi / nvidia,tegra20-sflash.txt

diff --git a/Documentation/devicetree/bindings/spi/nvidia,tegra20-sflash.txt b/Documentation/devicetree/bindings/spi/nvidia,tegra20-sflash.txt
index bdf08e6dec9bdf325fe9a992c2dfd611dbd46a92..c212491929b5b84832d7ddc06db6c1a9113fae69 100644 (file)
--- a/Documentation/devicetree/bindings/spi/nvidia,tegra20-sflash.txt
+++ b/Documentation/devicetree/bindings/spi/nvidia,tegra20-sflash.txt
@@ -34,5 +34,4 @@ spi@7000c380 {
        reset-names = "spi";
        dmas = <&apbdma 11>, <&apbdma 11>;
        dma-names = "rx", "tx";
-       status = "disabled";
 };