summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorAndrew Lunn <andrew@lunn.ch>2012-07-27 16:45:25 +0200
committerAndrew Lunn <andrew@lunn.ch>2012-07-27 16:45:25 +0200
commit89fb2d77d5daa821e3868ea59963f28249974840 (patch)
tree6cc80209a208133000c203cf9a9f61dd42fd53a9 /Documentation
parent4297103560b4c5aba904e4711e982a039619f1f6 (diff)
parent778435045a416da71f1757a80e37200a5ea5af70 (diff)
downloadlinux-89fb2d77d5daa821e3868ea59963f28249974840.tar.gz
linux-89fb2d77d5daa821e3868ea59963f28249974840.tar.bz2
linux-89fb2d77d5daa821e3868ea59963f28249974840.zip
Merge branch 'v3.5-rc7-fixes' into v3.5-rc7-dt-v3
Merge in branch already pulled. Fulfils dependancies needed by this patchset.
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/mtd/orion-nand.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/mtd/orion-nand.txt b/Documentation/devicetree/bindings/mtd/orion-nand.txt
index b2356b7d2fa4..2d6ab660e603 100644
--- a/Documentation/devicetree/bindings/mtd/orion-nand.txt
+++ b/Documentation/devicetree/bindings/mtd/orion-nand.txt
@@ -1,7 +1,7 @@
NAND support for Marvell Orion SoC platforms
Required properties:
-- compatible : "mrvl,orion-nand".
+- compatible : "marvell,orion-nand".
- reg : Base physical address of the NAND and length of memory mapped
region
@@ -24,7 +24,7 @@ nand@f4000000 {
ale = <1>;
bank-width = <1>;
chip-delay = <25>;
- compatible = "mrvl,orion-nand";
+ compatible = "marvell,orion-nand";
reg = <0xf4000000 0x400>;
partition@0 {