Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszer...

[sfrench/cifs-2.6.git] / Documentation / devicetree / bindings / arm / arch_timer.txt

diff --git a/Documentation/devicetree/bindings/arm/arch_timer.txt b/Documentation/devicetree/bindings/arm/arch_timer.txt
index e926aea1147d49a06aadb5bc39cd4802afba7053..68301b77e854c86abc7d8e63cf67bcedb8b4b174 100644 (file)
--- a/Documentation/devicetree/bindings/arm/arch_timer.txt
+++ b/Documentation/devicetree/bindings/arm/arch_timer.txt
@@ -108,6 +108,5 @@ Example:
                        frame-number = <1>
                        interrupts = <0 15 0x8>;
                        reg = <0xf0003000 0x1000>;
-                       status = "disabled";
                };
        };